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, feature/twig-template-engine has been updated
via 8ad220271d56bf343148948d2131f85a3eeb8cc9 (commit)
from 339ca70a831845d61e09e471162b9966eb015c9c (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=8ad220271d56bf343148948d2131f85a3eeb8cc9
commit 8ad220271d56bf343148948d2131f85a3eeb8cc9
Author: Roland Mas <[email protected]>
Date: Thu Oct 6 13:28:31 2016 +0200
Fixed search boxes for Twig
diff --git a/src/common/include/Navigation.class.php
b/src/common/include/Navigation.class.php
index 34d8415..aca6109 100644
--- a/src/common/include/Navigation.class.php
+++ b/src/common/include/Navigation.class.php
@@ -168,6 +168,8 @@ class Navigation extends FFError {
* Get the searchBox HTML code.
*/
function getSearchBox() {
+ global $HTML;
+
$vars = $this->getSearchBoxData();
$res = "";
$res .= $HTML->openForm(array('id' => 'searchBox', 'action' =>
'/search/', 'method' => 'get'));
@@ -176,11 +178,12 @@ class Navigation extends FFError {
$searchEngines = $vars['search_engines'];
for($i = 0, $max = count($searchEngines); $i < $max; $i++) {
$searchEngine =& $searchEngines[$i];
- $attrs = array('value' => $searchEngine->getType());
- if ( $type_of_search == $searchEngine->getType()) {
+ $type = $searchEngine['value'];
+ $attrs = array('value' => $type);
+ if ( $type_of_search == $type) {
$attrs['selected'] = 'selected';
}
- $res .= html_e('option', $attrs,
$searchEngine->getLabel($parameters), false);
+ $res .= html_e('option', $attrs, $searchEngine['name'],
false);
}
$res .= html_ac(html_ap() - 1);
-----------------------------------------------------------------------
Summary of changes:
src/common/include/Navigation.class.php | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
