summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-06-26 21:38:38 +0000
committerDries Buytaert <dries@buytaert.net>2010-06-26 21:38:38 +0000
commita6012a2062fc116608b1a59adaec00f63dd28953 (patch)
treed04c2bfad2b0a9cbe8f832be1eb21c7216e51536 /includes
parente27e1a0e0df1e070d8172921461b815317f4bfaa (diff)
downloadbrdo-a6012a2062fc116608b1a59adaec00f63dd28953.tar.gz
brdo-a6012a2062fc116608b1a59adaec00f63dd28953.tar.bz2
- Patch #838408 by chx: remove hook_menu_active_handler_alter().
Diffstat (limited to 'includes')
-rw-r--r--includes/common.inc3
-rw-r--r--includes/menu.inc3
2 files changed, 1 insertions, 5 deletions
diff --git a/includes/common.inc b/includes/common.inc
index 644947f5d..265fe022c 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 015a50939..0c17e5953 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'];