From a6012a2062fc116608b1a59adaec00f63dd28953 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 26 Jun 2010 21:38:38 +0000
Subject: [PATCH] - Patch #838408 by chx: remove
hook_menu_active_handler_alter().
---
includes/common.inc | 3 +--
includes/menu.inc | 3 ---
modules/system/system.api.php | 30 +-----------------------------
3 files changed, 2 insertions(+), 34 deletions(-)
diff --git a/includes/common.inc b/includes/common.inc
index 644947f5d0a1..265fe022cfc8 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -2273,7 +2273,7 @@ function l($text, $path, array $options = array()) {
* callback is drupal_deliver_html_page() which delivers the content as an HTML
* page, complete with blocks in addition to the content. This default can be
* overridden on a per menu item basis by setting 'delivery callback' in
- * hook_menu(), hook_menu_alter(), or hook_menu_active_handler_alter().
+ * hook_menu(), hook_menu_alter().
* Additionally, modules may use hook_page_delivery_callback_alter() to specify
* a different delivery callback to use for the page request.
*
@@ -2303,7 +2303,6 @@ function l($text, $path, array $options = array()) {
* @see menu_execute_active_handler()
* @see hook_menu()
* @see hook_menu_alter()
- * @see hook_menu_active_handler_alter()
* @see hook_page_delivery_callback_alter()
*/
function drupal_deliver_page($page_callback_result, $default_delivery_callback = NULL) {
diff --git a/includes/menu.inc b/includes/menu.inc
index 015a50939173..0c17e595322c 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -459,9 +459,6 @@ function menu_execute_active_handler($path = NULL, $deliver = TRUE) {
if ($router_item = menu_get_item($path)) {
// hook_menu_alter() lets modules control menu router information that
// doesn't depend on the details of a particular page request.
- // Here, we want to give modules a chance to use request-time information
- // to make alterations just for this request.
- drupal_alter('menu_active_handler', $router_item, $path);
if ($router_item['access']) {
if ($router_item['include_file']) {
require_once DRUPAL_ROOT . '/' . $router_item['include_file'];
diff --git a/modules/system/system.api.php b/modules/system/system.api.php
index 1191802b42f3..dad82140b0f7 100644
--- a/modules/system/system.api.php
+++ b/modules/system/system.api.php
@@ -3511,34 +3511,6 @@ function hook_date_formats_alter(&$formats) {
}
}
-/**
- * Alters the router item for the active menu handler.
- *
- * Called by menu_execute_active_handler() to allow modules to alter the
- * information that will be used to handle the page request. Only use this
- * hook if an alteration specific to the page request is needed. Otherwise
- * use hook_menu_alter().
- *
- * @param $router_item
- * An array with the following keys:
- * - access: Boolean. Whether the user is allowed to see this page.
- * - file: A path to a file to include prior to invoking the page callback.
- * - page_callback: The function to call to build the page content.
- * - page_arguments: Arguments to pass to the page callback.
- * - delivery_callback: The function to call to deliver the result of the
- * page callback to the browser.
- * @param $path
- * The drupal path that was used for retrieving the router item.
- *
- * @see menu_execute_active_handler()
- * @see hook_menu()
- * @see hook_menu_alter()
- */
-function hook_menu_active_handler_alter(&$router_item, $path = NULL) {
- // Turn off access for all pages for all users.
- $router_item['access'] = FALSE;
-}
-
/**
* Alters the delivery callback used to send the result of the page callback to the browser.
*
@@ -3550,7 +3522,7 @@ function hook_menu_active_handler_alter(&$router_item, $path = NULL) {
* it can be used to set the delivery callback based on a HTTP request
* header (as shown in the code sample). To specify a delivery callback
* based on path information, use hook_menu(), hook_menu_alter() or
- * hook_menu_active_handler_alter().
+ * hook_page_delivery_callback_alter().
*
* This hook can also be used as an API function that can be used to explicitly
* set the delivery callback from some other function. For example, for a module
--
GitLab