From fc20ee6b691287363714f49ab90837359c3db951 Mon Sep 17 00:00:00 2001 From: rvelices Date: Wed, 30 Apr 2014 18:31:00 +0000 Subject: move QUERY_SEARCH template ssignment from index to menubar.inc.php (works also on photo pages) git-svn-id: http://piwigo.org/svn/trunk@28316 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/menubar.inc.php | 5 +++++ index.php | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/menubar.inc.php b/include/menubar.inc.php index 07ca96bcb..8f5d8eb49 100644 --- a/include/menubar.inc.php +++ b/include/menubar.inc.php @@ -40,6 +40,11 @@ function initialize_menu() $menu->load_registered_blocks(); $menu->prepare_display(); + if ( $page['section']=='search' and isset($page['qsearch_details']) ) + { + $template->assign('QUERY_SEARCH', htmlspecialchars($page['qsearch_details']['q']) ); + } + //--------------------------------------------------------------- external links if ( ($block=$menu->get_block('mbLinks')) and !empty($conf['links']) ) { diff --git a/index.php b/index.php index d6fb3959f..e030cb74b 100644 --- a/index.php +++ b/index.php @@ -85,11 +85,6 @@ if (count($page['items']) > $page['nb_image_page']) $template->assign('thumb_navbar', $page['navigation_bar'] ); -if ( $page['section']=='search' and isset($page['qsearch_details']) ) -{ - $template->assign('QUERY_SEARCH', htmlspecialchars($page['qsearch_details']['q']) ); -} - // caddie filling :-) if (isset($_GET['caddie'])) { -- cgit v1.2.3