Index: modules/menu/menu.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.install,v
retrieving revision 1.19
diff -u -r1.19 menu.install
--- modules/menu/menu.install	20 Jul 2009 18:51:33 -0000	1.19
+++ modules/menu/menu.install	4 Aug 2009 06:50:01 -0000
@@ -7,36 +7,6 @@
  */
 
 /**
- * Implement hook_install().
- */
-function menu_install() {
-  // Create tables.
-  drupal_install_schema('menu');
-  $system_menus = menu_list_system_menus();
-  $descriptions = array(
-    'navigation' => 'The <em>Navigation</em> menu contains links such as Recent posts (if the Tracker module is enabled). Non-administrative links are added to this menu by default by modules.',
-    'user-menu' => "The <em>User menu</em> contains links related to the user's account, as well as the 'Log out' link.",
-    'management' => 'The <em>Management</em> menu contains links for content creation, structure, user management, and similar site activities.',
-    'main-menu' => 'The <em>Main menu</em> is the default source for the Main links which are often used by themes to show the major sections of a site.',
-    'secondary-menu' => 'The <em>Secondary menu</em> is the default source for the Secondary links which are often used for legal notices, contact details, and other navigation items that play a lesser role than the Main links.',
-  );
-  $t = get_t();
-  $query = db_insert('menu_custom')->fields(array('menu_name', 'title', 'description'));
-  foreach ($system_menus as $menu_name => $title) {
-    $query->values(array('menu_name' => $menu_name, 'title' => $t($title), 'description' => $t($descriptions[$menu_name])))->execute();
-  }
-}
-
-/**
- * Implement hook_uninstall().
- */
-function menu_uninstall() {
-  // Remove tables.
-  drupal_uninstall_schema('menu');
-  menu_rebuild();
-}
-
-/**
  * Implement hook_schema().
  */
 function menu_schema() {
@@ -69,3 +39,32 @@
   return $schema;
 }
 
+/**
+ * Implement hook_install().
+ */
+function menu_install() {
+  // Create tables.
+  drupal_install_schema('menu');
+  $system_menus = menu_list_system_menus();
+  $descriptions = array(
+    'navigation' => 'The <em>Navigation</em> menu contains links such as Recent posts (if the Tracker module is enabled). Non-administrative links are added to this menu by default by modules.',
+    'user-menu' => "The <em>User menu</em> contains links related to the user's account, as well as the 'Log out' link.",
+    'management' => 'The <em>Management</em> menu contains links for content creation, structure, user management, and similar site activities.',
+    'main-menu' => 'The <em>Main menu</em> is the default source for the Main links which are often used by themes to show the major sections of a site.',
+    'secondary-menu' => 'The <em>Secondary menu</em> is the default source for the Secondary links which are often used for legal notices, contact details, and other navigation items that play a lesser role than the Main links.',
+  );
+  $t = get_t();
+  $query = db_insert('menu_custom')->fields(array('menu_name', 'title', 'description'));
+  foreach ($system_menus as $menu_name => $title) {
+    $query->values(array('menu_name' => $menu_name, 'title' => $t($title), 'description' => $t($descriptions[$menu_name])))->execute();
+  }
+}
+
+/**
+ * Implement hook_uninstall().
+ */
+function menu_uninstall() {
+  // Remove tables.
+  drupal_uninstall_schema('menu');
+  menu_rebuild();
+}