diff --git includes/view.inc includes/view.inc index 1ae691d..ea5415e 100644 --- includes/view.inc +++ includes/view.inc @@ -942,10 +942,14 @@ class view extends views_db_object { } /** - * Called to get hook_menu information from the view and the - * named display handler. + * Called to get hook_menu() information from the view and the named display handler. + * + * @param $display_id + * A display id. + * @param $callbacks + * A menu callback array passed from views_menu_alter(). */ - function execute_hook_menu($display_id = NULL) { + function execute_hook_menu($display_id = NULL, $callbacks = array()) { // Prepare the view with the information we have. // This was probably already called, but it's good to be safe. @@ -955,7 +959,7 @@ class view extends views_db_object { // Execute the view if (isset($this->display_handler)) { - return $this->display_handler->execute_hook_menu(); + return $this->display_handler->execute_hook_menu($callbacks); } } diff --git plugins/views_plugin_display_page.inc plugins/views_plugin_display_page.inc index 2db5c61..4084429 100644 --- plugins/views_plugin_display_page.inc +++ plugins/views_plugin_display_page.inc @@ -47,7 +47,7 @@ class views_plugin_display_page extends views_plugin_display { /** * Add this display's path information to Drupal's menu system. */ - function execute_hook_menu() { + function execute_hook_menu($callbacks) { $items = array(); // Replace % with the link to our standard views argument loader // views_arg_load -- which lives in views.module diff --git views.module views.module index 92a06bd..28c269a 100644 --- views.module +++ views.module @@ -196,7 +196,7 @@ function views_menu_alter(&$callbacks) { $views = views_get_applicable_views('uses hook menu'); foreach ($views as $data) { list($view, $display_id) = $data; - $result = $view->execute_hook_menu($display_id); + $result = $view->execute_hook_menu($display_id, $callbacks); if (is_array($result)) { // The menu system doesn't support having two otherwise // identical paths with different placeholders. So we