? move_menu_api_contents.patch ? move_menu_api_contents_01.patch ? move_menu_api_contents_02.patch ? sites/default/files ? sites/default/settings.php Index: modules/menu/menu.api.php =================================================================== RCS file: modules/menu/menu.api.php diff -N modules/menu/menu.api.php --- modules/menu/menu.api.php 24 Feb 2009 16:02:51 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,149 +0,0 @@ - 'blogs', - 'page callback' => 'blog_page', - 'access arguments' => array('access content'), - 'type' => MENU_SUGGESTED_ITEM, - ); - $items['blog/feed'] = array( - 'title' => 'RSS feed', - 'page callback' => 'blog_feed', - 'access arguments' => array('access content'), - 'type' => MENU_CALLBACK, - ); - - return $items; -} - -/** - * Alter the data being saved to the {menu_router} table after hook_menu is invoked. - * - * This hook is invoked by menu_router_build(). The menu definitions are passed - * in by reference. Each element of the $items array is one item returned - * by a module from hook_menu. Additional items may be added, or existing items - * altered. - * - * @param $items - * Associative array of menu router definitions returned from hook_menu(). - * @return - * None. - */ -function hook_menu_alter(&$items) { - // Example - disable the page at node/add - $items['node/add']['access callback'] = FALSE; -} - -/** - * Alter the data being saved to the {menu_links} table by menu_link_save(). - * - * @param $item - * Associative array defining a menu link as passed into menu_link_save(). - * @param $menu - * Associative array containg the menu router returned from menu_router_build(). - * @return - * None. - */ -function hook_menu_link_alter(&$item, $menu) { - // Example 1 - make all new admin links hidden (a.k.a disabled). - if (strpos($item['link_path'], 'admin') === 0 && empty($item['mlid'])) { - $item['hidden'] = 1; - } - // Example 2 - flag a link to be altered by hook_translated_menu_link_alter() - if ($item['link_path'] == 'devel/cache/clear') { - $item['options']['alter'] = TRUE; - } -} - -/** - * Alter a menu link after it's translated, but before it's rendered. - * - * This hook may be used, for example, to add a page-specific query string. - * For performance reasons, only links that have $item['options']['alter'] == TRUE - * will be passed into this hook. The $item['options']['alter'] flag should - * generally be set using hook_menu_link_alter(). - * - * @param $item - * Associative array defining a menu link after _menu_link_translate() - * @param $map - * Associative array containing the menu $map (path parts and/or objects). - * @return - * None. - */ -function hook_translated_menu_link_alter(&$item, $map) { - if ($item['href'] == 'devel/cache/clear') { - $item['localized_options']['query'] = drupal_get_destination(); - } -} - -/** - * @} End of "addtogroup hooks". - */ Index: modules/system/system.api.php =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.api.php,v retrieving revision 1.24 diff -u -p -r1.24 system.api.php --- modules/system/system.api.php 10 Mar 2009 16:08:43 -0000 1.24 +++ modules/system/system.api.php 21 Mar 2009 00:22:26 -0000 @@ -225,6 +225,140 @@ function hook_js_alter(&$javascript) { * * @see drupal_render_page() */ + + /** + * Define menu items and page callbacks. + * + * This hook enables modules to register paths, which determines whose + * requests are to be handled. Depending on the type of registration + * requested by each path, a link is placed in the the navigation block and/or + * an item appears in the menu administration page (q=admin/menu). + * + * This hook is called rarely - for example when modules are enabled. + * + * @return + * An array of menu items. Each menu item has a key corresponding to the + * Drupal path being registered. The item is an associative array that may + * contain the following key-value pairs: + * + * - "title": Required. The untranslated title of the menu item. + * - "title callback": Function to generate the title, defaults to t(). + * If you require only the raw string to be output, set this to FALSE. + * - "title arguments": Arguments to send to t() or your custom callback. + * - "description": The untranslated description of the menu item. + * - "page callback": The function to call to display a web page when the user + * visits the path. If omitted, the parent menu item's callback will be used + * instead. + * - "page arguments": An array of arguments to pass to the page callback + * function. Integer values pass the corresponding URL component (see arg()). + * - "access callback": A function returning a boolean value that determines + * whether the user has access rights to this menu item. Defaults to + * user_access() unless a value is inherited from a parent menu item.. + * - "access arguments": An array of arguments to pass to the access callback + * function. Integer values pass the corresponding URL component. + * - "weight": An integer that determines relative position of items in the + * menu; higher-weighted items sink. Defaults to 0. When in doubt, leave + * this alone; the default alphabetical order is usually best. + * - "menu_name": Optional. Set this to a custom menu if you don't want your + * item to be placed in Navigation. + * - "type": A bitmask of flags describing properties of the menu item. + * Many shortcut bitmasks are provided as constants in menu.inc: + * - MENU_NORMAL_ITEM: Normal menu items show up in the menu tree and can be + * moved/hidden by the administrator. + * - MENU_CALLBACK: Callbacks simply register a path so that the correct + * function is fired when the URL is accessed. + * - MENU_SUGGESTED_ITEM: Modules may "suggest" menu items that the + * administrator may enable. + * - MENU_LOCAL_TASK: Local tasks are rendered as tabs by default. + * - MENU_DEFAULT_LOCAL_TASK: Every set of local tasks should provide one + * "default" task, that links to the same path as its parent when clicked. + * If the "type" key is omitted, MENU_NORMAL_ITEM is assumed. + * + * For a detailed usage example, see page_example.module. + * + * For comprehensive documentation on the menu system, see + * http://drupal.org/node/102338. + * + */ +function hook_menu() { + $items = array(); + + $items['blog'] = array( + 'title' => 'blogs', + 'page callback' => 'blog_page', + 'access arguments' => array('access content'), + 'type' => MENU_SUGGESTED_ITEM, + ); + $items['blog/feed'] = array( + 'title' => 'RSS feed', + 'page callback' => 'blog_feed', + 'access arguments' => array('access content'), + 'type' => MENU_CALLBACK, + ); + + return $items; +} + +/** + * Alter the data being saved to the {menu_router} table after hook_menu is invoked. + * + * This hook is invoked by menu_router_build(). The menu definitions are passed + * in by reference. Each element of the $items array is one item returned + * by a module from hook_menu. Additional items may be added, or existing items + * altered. + * + * @param $items + * Associative array of menu router definitions returned from hook_menu(). + * @return + * None. + */ +function hook_menu_alter(&$items) { + // Example - disable the page at node/add + $items['node/add']['access callback'] = FALSE; +} + +/** + * Alter the data being saved to the {menu_links} table by menu_link_save(). + * + * @param $item + * Associative array defining a menu link as passed into menu_link_save(). + * @param $menu + * Associative array containg the menu router returned from menu_router_build(). + * @return + * None. + */ +function hook_menu_link_alter(&$item, $menu) { + // Example 1 - make all new admin links hidden (a.k.a disabled). + if (strpos($item['link_path'], 'admin') === 0 && empty($item['mlid'])) { + $item['hidden'] = 1; + } + // Example 2 - flag a link to be altered by hook_translated_menu_link_alter() + if ($item['link_path'] == 'devel/cache/clear') { + $item['options']['alter'] = TRUE; + } +} + +/** + * Alter a menu link after it's translated, but before it's rendered. + * + * This hook may be used, for example, to add a page-specific query string. + * For performance reasons, only links that have $item['options']['alter'] == TRUE + * will be passed into this hook. The $item['options']['alter'] flag should + * generally be set using hook_menu_link_alter(). + * + * @param $item + * Associative array defining a menu link after _menu_link_translate() + * @param $map + * Associative array containing the menu $map (path parts and/or objects). + * @return + * None. + */ +function hook_translated_menu_link_alter(&$item, $map) { + if ($item['href'] == 'devel/cache/clear') { + $item['localized_options']['query'] = drupal_get_destination(); + } +} + function hook_page_alter($page) { if (menu_get_object('node', 1)) { // We are on a node detail page. Append a standard disclaimer to the