Changeset 13366

Timestamp:

02/24/2010 08:06:36 AM (17 years ago)

Author:

ryan

Message:

Reorg nav menu files. see #11817

Location:

trunk

Files:

• wp-admin/includes/nav-menu.php (added)
• wp-admin/menu.php (modified) (1 diff)
• wp-admin/nav-menus.php (moved) (moved from trunk/wp-admin/custom-navigation.php ) (6 diffs)
• wp-includes/custom-navigation.php (deleted)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/nav-menu-template.php (added)
• wp-includes/nav-menu.php (added)
• wp-settings.php (modified) (1 diff)

trunk/wp-admin/menu.php

@@ -109 +109 @@
         $submenu['themes.php'][10] = array(_x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php');
         $submenu['themes.php'][15] = array(__('Add New Themes'), 'install_themes', 'theme-install.php');
-        $submenu['themes.php'][20] = array(__('Menus'), 'switch_themes', 'custom-navigation.php');
+        $submenu['themes.php'][20] = array(__('Menus'), 'switch_themes', 'nav-menus.php');
 
 $update_plugins = get_site_transient( 'update_plugins' );

trunk/wp-admin/nav-menus.php

@@ -28 +28 @@
 
 require_once('admin-header.php');
-require_once (ABSPATH . WPINC . '/custom-navigation.php');
+require_once(ABSPATH . 'wp-admin/includes/nav-menu.php');
 
 function wp_reset_nav_menu() {
@@ -183 +183 @@
                                                 <li><?php echo esc_html( $menu->name ) . $sep; ?></li>
 <?php                           } else { ?>
-                        <li><a href='custom-navigation.php?edit_menu=<?php echo esc_attr($menu->term_id); ?>'><?php echo esc_html( $menu->name ); ?></a><?php echo $sep; ?></li>
+                        <li><a href='nav-menus.php?edit_menu=<?php echo esc_attr($menu->term_id); ?>'><?php echo esc_html( $menu->name ); ?></a><?php echo $sep; ?></li>
 <?php                           }
                                 }
@@ -201 +201 @@
                 ?>
                 <?php echo $messagesdiv; ?>
-                <form onsubmit="updatepostdata()" action="custom-navigation.php" method="post"  enctype="multipart/form-data">
+                <form onsubmit="updatepostdata()" action="nav-menus.php" method="post"  enctype="multipart/form-data">
 
                 <input type="hidden" name="licount" id="licount" value="0" />
@@ -224 +224 @@
                         $output_type = "backend";
                         // MAIN OUTPUT FUNCTION
-                        wp_custom_navigation_output( 'type='.$output_type.'&name='.$menu_title.'&id='.$menu_selected_id );
+                        wp_print_nav_menu( 'type='.$output_type.'&name='.$menu_title.'&id='.$menu_selected_id );
                 }
                 ?>
@@ -383 +383 @@
                                                 $intCounter = 0;
                                                 //Get default Pages
-                                                $intCounter = wp_custom_nav_get_pages($intCounter,'default');
+                                                $intCounter = wp_nav_menu_get_pages($intCounter,'default');
                                         ?>
                                 </ul>
@@ -463 +463 @@
                                         <?php
                                                 // Get default Categories
-                                                $intCounter = wp_custom_nav_get_categories($intCounter, 'default');
+                                                $intCounter = wp_nav_menu_get_categories($intCounter, 'default');
                                         ?>
                                 </ul>

trunk/wp-includes/general-template.php

@@ -2216 +2216 @@
 }
 
-/**
- * Outputs a navigation menu.
- *
- * @since 3.0.0
- *
- * @param array $args Arguments
- */
-function wp_nav_menu( $args = array() ) {
-        require_once (ABSPATH . WPINC . '/custom-navigation.php');
-        wp_custom_navigation_output($args);
-}
-
 ?>

trunk/wp-settings.php

@@ -129 +129 @@
 require( ABSPATH . WPINC . '/http.php' );
 require( ABSPATH . WPINC . '/widgets.php' );
+require( ABSPATH . WPINC . '/nav-menu.php' );
+require( ABSPATH . WPINC . '/nav-menu-template.php' );
 
 // Load multisite-specific files.