WordPress.org

Make WordPress Core

Changeset 13366


Ignore:
Timestamp:
02/24/2010 08:06:36 AM (12 years ago)
Author:
ryan
Message:

Reorg nav menu files. see #11817

Location:
trunk
Files:
3 added
1 deleted
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/menu.php

    r13339 r13366  
    109109    $submenu['themes.php'][10] = array(_x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php');
    110110    $submenu['themes.php'][15] = array(__('Add New Themes'), 'install_themes', 'theme-install.php');
    111     $submenu['themes.php'][20] = array(__('Menus'), 'switch_themes', 'custom-navigation.php');
     111    $submenu['themes.php'][20] = array(__('Menus'), 'switch_themes', 'nav-menus.php');
    112112
    113113$update_plugins = get_site_transient( 'update_plugins' );
  • trunk/wp-admin/nav-menus.php

    r13363 r13366  
    2828
    2929require_once('admin-header.php');
    30 require_once (ABSPATH . WPINC . '/custom-navigation.php');
     30require_once(ABSPATH . 'wp-admin/includes/nav-menu.php');
    3131
    3232function wp_reset_nav_menu() {
     
    183183                        <li><?php echo esc_html( $menu->name ) . $sep; ?></li>
    184184<?php               } else { ?>
    185             <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>
     185            <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>
    186186<?php               }
    187187                }
     
    201201        ?>
    202202        <?php echo $messagesdiv; ?>
    203         <form onsubmit="updatepostdata()" action="custom-navigation.php" method="post"  enctype="multipart/form-data">
     203        <form onsubmit="updatepostdata()" action="nav-menus.php" method="post"  enctype="multipart/form-data">
    204204
    205205        <input type="hidden" name="licount" id="licount" value="0" />
     
    224224            $output_type = "backend";
    225225            // MAIN OUTPUT FUNCTION
    226             wp_custom_navigation_output( 'type='.$output_type.'&name='.$menu_title.'&id='.$menu_selected_id );
     226            wp_print_nav_menu( 'type='.$output_type.'&name='.$menu_title.'&id='.$menu_selected_id );
    227227        }
    228228        ?>
     
    383383                        $intCounter = 0;
    384384                        //Get default Pages
    385                         $intCounter = wp_custom_nav_get_pages($intCounter,'default');
     385                        $intCounter = wp_nav_menu_get_pages($intCounter,'default');
    386386                    ?>
    387387                </ul>
     
    463463                    <?php
    464464                        // Get default Categories
    465                         $intCounter = wp_custom_nav_get_categories($intCounter, 'default');
     465                        $intCounter = wp_nav_menu_get_categories($intCounter, 'default');
    466466                    ?>
    467467                </ul>
  • trunk/wp-includes/general-template.php

    r13361 r13366  
    22162216}
    22172217
    2218 /**
    2219  * Outputs a navigation menu.
    2220  *
    2221  * @since 3.0.0
    2222  *
    2223  * @param array $args Arguments
    2224  */
    2225 function wp_nav_menu( $args = array() ) {
    2226     require_once (ABSPATH . WPINC . '/custom-navigation.php');
    2227     wp_custom_navigation_output($args);
    2228 }
    2229 
    22302218?>
  • trunk/wp-settings.php

    r13268 r13366  
    129129require( ABSPATH . WPINC . '/http.php' );
    130130require( ABSPATH . WPINC . '/widgets.php' );
     131require( ABSPATH . WPINC . '/nav-menu.php' );
     132require( ABSPATH . WPINC . '/nav-menu-template.php' );
    131133
    132134// Load multisite-specific files.
Note: See TracChangeset for help on using the changeset viewer.