From e63e85020b6846c35624f04c60b40f1aa11db3b1 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Mon, 24 Aug 2009 00:10:46 +0000
Subject: Of all the patches to accidentally commit without a message. :(
 Rolling back registry rip. Let's try that again.

---
 modules/menu/menu.module | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'modules/menu/menu.module')

diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 45983e55e..beb29590b 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -54,7 +54,6 @@ function menu_menu() {
     'page callback' => 'menu_overview_page',
     'access callback' => 'user_access',
     'access arguments' => array('administer menu'),
-    'file' => 'menu.admin.inc',
   );
   $items['admin/structure/menu/list'] = array(
     'title' => 'List menus',
@@ -67,7 +66,6 @@ function menu_menu() {
     'page arguments' => array('menu_edit_menu', 'add'),
     'access arguments' => array('administer menu'),
     'type' => MENU_LOCAL_ACTION,
-    'file' => 'menu.admin.inc',
   );
   $items['admin/structure/menu/settings'] = array(
     'title' => 'Settings',
@@ -76,7 +74,6 @@ function menu_menu() {
     'access arguments' => array('administer menu'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 5,
-    'file' => 'menu.admin.inc',
   );
   $items['admin/structure/menu-customize/%menu'] = array(
     'title' => 'Customize menu',
@@ -86,7 +83,6 @@ function menu_menu() {
     'title arguments' => array(3),
     'access arguments' => array('administer menu'),
     'type' => MENU_CALLBACK,
-    'file' => 'menu.admin.inc',
   );
   $items['admin/structure/menu-customize/%menu/list'] = array(
     'title' => 'List links',
@@ -99,7 +95,6 @@ function menu_menu() {
     'page arguments' => array('menu_edit_item', 'add', NULL, 3),
     'access arguments' => array('administer menu'),
     'type' => MENU_LOCAL_ACTION,
-    'file' => 'menu.admin.inc',
   );
   $items['admin/structure/menu-customize/%menu/edit'] = array(
     'title' => 'Edit menu',
@@ -107,7 +102,6 @@ function menu_menu() {
     'page arguments' => array('menu_edit_menu', 'edit', 3),
     'access arguments' => array('administer menu'),
     'type' => MENU_LOCAL_TASK,
-    'file' => 'menu.admin.inc',
   );
   $items['admin/structure/menu-customize/%menu/delete'] = array(
     'title' => 'Delete menu',
@@ -115,7 +109,6 @@ function menu_menu() {
     'page arguments' => array(3),
     'access arguments' => array('administer menu'),
     'type' => MENU_CALLBACK,
-    'file' => 'menu.admin.inc',
   );
   $items['admin/structure/menu/item/%menu_link/edit'] = array(
     'title' => 'Edit menu link',
@@ -123,7 +116,6 @@ function menu_menu() {
     'page arguments' => array('menu_edit_item', 'edit', 4, NULL),
     'access arguments' => array('administer menu'),
     'type' => MENU_CALLBACK,
-    'file' => 'menu.admin.inc',
   );
   $items['admin/structure/menu/item/%menu_link/reset'] = array(
     'title' => 'Reset menu link',
@@ -131,7 +123,6 @@ function menu_menu() {
     'page arguments' => array('menu_reset_item_confirm', 4),
     'access arguments' => array('administer menu'),
     'type' => MENU_CALLBACK,
-    'file' => 'menu.admin.inc',
   );
   $items['admin/structure/menu/item/%menu_link/delete'] = array(
     'title' => 'Delete menu link',
@@ -139,7 +130,6 @@ function menu_menu() {
     'page arguments' => array(4),
     'access arguments' => array('administer menu'),
     'type' => MENU_CALLBACK,
-    'file' => 'menu.admin.inc',
   );
   return $items;
 }
@@ -167,7 +157,7 @@ function menu_theme() {
  */
 function menu_enable() {
   menu_rebuild();
-  $base_link = db_query("SELECT mlid AS plid, menu_name FROM {menu_links} WHERE link_path = 'admin/structure/menu' AND module = 'system'")->fetchAssoc();
+  $base_link = db_query("SELECT mlid AS plid, menu_name from {menu_links} WHERE link_path = 'admin/structure/menu' AND module = 'system'")->fetchAssoc();
   $base_link['router_path'] = 'admin/structure/menu-customize/%';
   $base_link['module'] = 'menu';
   $result = db_query("SELECT * FROM {menu_custom}", array(), array('fetch' => PDO::FETCH_ASSOC));
-- 
cgit v1.2.3