[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1337-g9ab8d7f

Franck Villaume nerville at libremir.placard.fr.eu.org
Fri Jan 13 15:09:04 CET 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  9ab8d7f757cf7ab30d9eec72a70cfab5ac7070fd (commit)
      from  1dadcf1b8511a64a515578f524cda966f5458044 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=9ab8d7f757cf7ab30d9eec72a70cfab5ac7070fd

commit 9ab8d7f757cf7ab30d9eec72a70cfab5ac7070fd
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Fri Jan 13 14:08:52 2017 +0000

    fix advanced search renderer: overwritten variable

diff --git a/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php b/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
index 1f65ee4..46e6b95 100644
--- a/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
@@ -190,20 +190,20 @@ class AdvancedSearchHtmlSearchRenderer extends HtmlGroupSearchRenderer {
 
 		$result .= '<h2><a name="'.$section.'"></a>'.$title.'</h2>';
 
-		$result = $renderer->searchQuery->getData($renderer->searchQuery->getRowsPerPage(),$renderer->searchQuery->getOffset());
+		$res = $renderer->searchQuery->getData($renderer->searchQuery->getRowsPerPage(),$renderer->searchQuery->getOffset());
 
-		if (count($result) > 0) {
+		if (count($res) > 0) {
 			if ($renderer->searchQuery->getRowsTotalCount() >= $renderer->searchQuery->getRowsPerPage())
 				$result .= '<i>' . sprintf(_('Note: only the first %d results for this category are displayed.'), $renderer->searchQuery->getRowsPerPage()) . '</i>';
 			$result .= $HTML->listTabletop($renderer->tableHeaders);
 			$result .= $renderer->getRows();
 			$result .= $HTML->listTableBottom();
 		} elseif(method_exists($renderer, 'getSections') && (count($renderer->getSections($this->groupId)) == 0)) {
-                $result .= '<p>'.sprintf(_('No matches found for “%s”'), stripslashes(htmlspecialchars($this->words)));
+			$result .= '<p>'.sprintf(_('No matches found for “%s”'), stripslashes(htmlspecialchars($this->words)));
 			$result .= _(' - ');
 			$result .= _('No sections available (check your permissions)').'</p>';
 		} else {
-                $result .= '<p>'.sprintf(_('No matches found for “%s”'), stripslashes(htmlspecialchars($this->words))).'</p>';
+			$result .= '<p>'.sprintf(_('No matches found for “%s”'), stripslashes(htmlspecialchars($this->words))).'</p>';
 		}
 		return $result;
 	}

-----------------------------------------------------------------------

Summary of changes:
 .../include/renderers/AdvancedSearchHtmlSearchRenderer.class.php  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list