#817810: Search menu retooling caused the title of search pages to get lost.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a30599c..649d10e 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -52,6 +52,7 @@ Restore a less aggressive plugin caching.
 #657652: PHP Access rules become uneditable if they had no description.
 #680778 by hefox: Taxonomy synonyms not showing correctly in term list content type.
 #617678: Improve 'back' button handling during adding a page in page manager.
+#817810: Search menu retooling caused the title of search pages to get lost.
 
 ctools 6.x-1.6 (2010-Jun-1)
 ==============

diff --git a/includes/menu.inc b/includes/menu.inc
index dc11a3b..77e6890 100644 (file)
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -215,7 +215,7 @@ function ctools_menu_tree_page_data($item, $menu_name = 'navigation') {
 function ctools_menu_set_trail_parent($path) {
   $current = menu_get_active_trail();
   $keep = array_pop($current);
-  
+
   $trail = ctools_get_menu_trail($path);
   $trail[] = $keep;
 

diff --git a/page_manager/plugins/tasks/search.inc b/page_manager/plugins/tasks/search.inc
index b4cfaa9..7bc934b 100644 (file)
--- a/page_manager/plugins/tasks/search.inc
+++ b/page_manager/plugins/tasks/search.inc
@@ -71,13 +71,15 @@ function page_manager_search_menu_alter(&$items, $task) {
     $items["search/$name/%menu_tail"]['tab_parent'] = "search/node/%menu_tail";
     $items["search/$name/%menu_tail"]['tab_root'] = "search/node/%menu_tail";
 
+    $callback = $items["search/$name/%menu_tail"]['page callback'];
+
     // Even if a search page is not implemented, we need to add an extra
     // entry anyway, for two reasons.
     //
     // 1) The 'search' menu entry actually handles all entries by default
     // and that is going to be bad if the node search is overridden and
     // 2) We need to have dual entries to make sure that the tabs are right.
-    if (variable_get('page_manager_search_disabled_' . $name, TRUE)) {
+    if (variable_get('page_manager_search_disabled_' . $name, TRUE) || ($callback != 'search_view' && !variable_get('page_manager_override_anyway', FALSE))) {
       $items["search/$name"] = $items["search/$name/%menu_tail"];
 
       // Put these items under the real search tab.
@@ -92,11 +94,15 @@ function page_manager_search_menu_alter(&$items, $task) {
         $items["search/$name/%menu_tail"]['weight'] = -10;
       }
 
+      if ($callback == 'search_view' || variable_get('page_manager_override_anyway', FALSE)) {
+        $items["search/$name/%menu_tail"]['page callback'] = 'page_manager_search_view';
+        $items["search/$name/%menu_tail"]['file path'] = $task['path'];
+        $items["search/$name/%menu_tail"]['file'] = $task['file'];
+      }
+
       continue;
     }
 
-    // Override the node view handler for our purpose.
-    $callback = $items["search/$name/%menu_tail"]['page callback'];
     if ($callback == 'search_view' || variable_get('page_manager_override_anyway', FALSE)) {
       $items["search/$name/%menu_tail"]['page callback'] = 'page_manager_search_page';
       $items["search/$name/%menu_tail"]['file path'] = $task['path'];
@@ -128,6 +134,7 @@ function page_manager_search_menu_alter(&$items, $task) {
       }
     }
     else {
+
       // automatically disable this task if it cannot be enabled.
       variable_set('page_manager_search_disabled_' . $name, TRUE);
       if (!empty($GLOBALS['page_manager_enabling_search'])) {
@@ -138,6 +145,20 @@ function page_manager_search_menu_alter(&$items, $task) {
 }
 
 /**
+ * Replacement function for normal search view.
+ *
+ * This function resets the active trail because menu system loses track
+ * of it due to the special way we're handling search items.
+ */
+function page_manager_search_view($type = 'node') {
+  ctools_include('menu');
+  menu_set_active_trail(ctools_get_menu_trail('search/' . $type));
+
+  module_load_include('inc', 'search', 'search.pages');
+  return search_view($type);
+}
+
+/**
  * Entry point for our overridden node view.
  *
  * This function asks its assigned handlers who, if anyone, would like
@@ -145,6 +166,9 @@ function page_manager_search_menu_alter(&$items, $task) {
  * node view, which is node_page_view().
  */
 function page_manager_search_page($type) {
+  ctools_include('menu');
+  menu_set_active_trail(ctools_get_menu_trail('search/' . $type));
+
   // Get the arguments and construct a keys string out of them.
   $args = func_get_args();