<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13366] trunk: Reorg nav menu files.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13366">13366</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-24 08:06:36 +0000 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reorg nav menu files. see <a href="http://trac.wordpress.org/ticket/11817">#11817</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpsettingsphp">trunk/wp-settings.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesnavmenuphp">trunk/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
<li><a href="#trunkwpincludesnavmenutemplatephp">trunk/wp-includes/nav-menu-template.php</a></li>
<li><a href="#trunkwpincludesnavmenuphp">trunk/wp-includes/nav-menu.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpadmincustomnavigationphp">trunk/wp-admin/custom-navigation.php</a></li>
<li><a href="#trunkwpincludescustomnavigationphp">trunk/wp-includes/custom-navigation.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustomnavigationphp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-admin/custom-navigation.php (13365 => 13366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-navigation.php 2010-02-24 07:58:14 UTC (rev 13365)
+++ trunk/wp-admin/custom-navigation.php 2010-02-24 08:06:36 UTC (rev 13366)
</span><span class="lines">@@ -1,509 +0,0 @@
</span><del>-<?php
-/**
- * WordPress Administration for Navigation Menus
- * Interface functions
- *
- * @author Jeffikus <pearce.jp@gmail.com>
- * @version 1.1.0
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-require_once('admin.php');
-
-if ( ! current_user_can('switch_themes') )
- wp_die( __( 'Cheatin&#8217; uh?' ));
-
-wp_admin_css( 'custom-navigation' );
-wp_enqueue_script( 'jquery' );
-wp_enqueue_script( 'jquery-ui-draggable' );
-wp_enqueue_script( 'jquery-ui-droppable' );
-wp_enqueue_script( 'jquery-ui-sortable' );
-wp_enqueue_script( 'jquery-ui-dialog' );
-wp_enqueue_script( 'custom-navigation-dynamic-functions' );
-wp_enqueue_script( 'custom-navigation-default-items' );
-wp_enqueue_script( 'jquery-autocomplete' );
-wp_enqueue_script( 'custom-navigation-php-functions' );
-
-require_once('admin-header.php');
-require_once (ABSPATH . WPINC . '/custom-navigation.php');
-
-function wp_reset_nav_menu() {
- wp_custom_navigation_setup(true);
-
- return true;
-}
-
-$messagesdiv = '';
-$menu_id_in_edit = 0;
-$updated = false;
-
-// Check which menu is selected and if menu is in edit already
-if ( isset( $_GET['edit_menu'] ) ) {
- $menu_selected_id = (int) $_GET['edit_menu'];
- $updated = true;
-} elseif ( isset( $_POST[ 'menu_id_in_edit' ] ) ) {
- $menu_selected_id = (int) $_POST[ 'menu_id_in_edit' ];
-} else {
- $menu_selected_id = 0;
-}
-
-if ( isset( $_POST[ 'delete_menu' ] ) && $menu_selected_id > 0 ) {
- wp_delete_nav_menu( $menu_selected_id );
- $menu_selected_id = 0;
- $updated = true;
-}
-
-// Default Menu to show
-$custom_menus = wp_get_nav_menus();
-if ( ! $menu_selected_id && ! empty( $custom_menus ) )
- $menu_selected_id = $custom_menus[0]->term_id;
-
-$menu_title = '';
-if ( $menu_selected_id > 0 ) {
- foreach ( $custom_menus as $menu ) {
- if ( $menu->term_id == $menu_selected_id ) {
- $menu_title = $menu->name;
- break;
- }
- }
-}
-
-if ( isset( $_POST['set_wp_menu'] ) ) {
- // @todo validate set_wp_menu
- update_option( 'wp_custom_nav_menu', $_POST['enable_wp_menu'] );
- $updated = true;
- $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . __('Menu has been updated!') . '</p></div>';
-}
-
-if ( isset( $_POST['licount'] ) )
- $postCounter = $_POST['licount'];
-else
- $postCounter = 0;
-
-// Create a new menu. Menus are stored as terms in the 'menu' taxonomy.
-if ( isset( $_POST['add_menu'] ) && ! $updated ) {
- $insert_menu_name = $_POST['add_menu_name'];
-
- if ( $insert_menu_name != '' ) {
- $menu = wp_create_nav_menu($insert_menu_name);
- if ( is_wp_error($menu) ) {
- $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . esc_html( $menu->get_error_message() ) . '</p></div>';
- } else {
- $custom_menus[$menu->term_id] = $menu;
- $menu_selected_id = $menu->term_id;
- $menu_id_in_edit = $menu_selected_id;
- $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . esc_html( sprintf( __('"%s" menu has been created!'), $menu->name ) ) . '</p></div>';
- $postCounter = 0;
- }
- } else {
- $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . __('Please enter a valid menu name.') . '</p></div>';
- }
- $updated = true;
-}
-
-if ( isset($_POST['reset_wp_menu']) && ! $updated ) {
- $success = wp_reset_nav_menu();
- if ( $success ) {
- // DISPLAY SUCCESS MESSAGE IF Menu Reset Correctly
- $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . __('The menu has been reset.') . '</p></div>';
- // GET reset menu id
- $custom_menus = array();
- $menu_selected_id = 0;
- } else {
- // DISPLAY SUCCESS MESSAGE IF Menu Reset Correctly
- $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . __('The menu could not be reset. Please try again.') . '</p></div>';
- }
-} elseif ( $postCounter > 0 && $menu_selected_id > 0 && ! $updated ) {
- $menu_items = wp_get_nav_menu_items( $menu_selected_id, array('orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID') );
- $parent_menu_ids = array();
-
- // Loop through all POST variables
- for ( $k = 1; $k <= $postCounter; $k++ ) {
- if (isset($_POST['dbid'.$k])) { $db_id = $_POST['dbid'.$k]; } else { $db_id = 0; }
- if (isset($_POST['postmenu'.$k])) { $object_id = $_POST['postmenu'.$k]; } else { $object_id = 0; }
- if (isset($_POST['parent'.$k])) { $parent_id = $_POST['parent'.$k]; } else { $parent_id = 0; }
- if (isset($_POST['title'.$k])) { $custom_title = $_POST['title'.$k]; } else { $custom_title = ''; }
- if (isset($_POST['linkurl'.$k])) { $custom_linkurl = $_POST['linkurl'.$k]; } else { $custom_linkurl = ''; }
- if (isset($_POST['description'.$k])) { $custom_description = $_POST['description'.$k]; } else { $custom_description = ''; }
- // doesn't seem to be used by UI
- if (isset($_POST['icon'.$k])) { $icon = $_POST['icon'.$k]; } else { $icon = 0; }
- if (isset($_POST['position'.$k])) { $position = $_POST['position'.$k]; } else { $position = 0; }
- if (isset($_POST['linktype'.$k])) { $linktype = $_POST['linktype'.$k]; } else { $linktype = 'custom'; }
- if (isset($_POST['anchortitle'.$k])) { $custom_anchor_title = $_POST['anchortitle'.$k]; } else { $custom_anchor_title = $custom_title; }
- if (isset($_POST['newwindow'.$k])) { $new_window = $_POST['newwindow'.$k]; } else { $new_window = 0; }
-
- $post = array( 'post_status' => 'publish', 'post_type' => 'nav_menu_item', 'post_author' => $user_ID,
- 'ping_status' => 0, 'post_parent' => 0, 'menu_order' => $position,
- 'guid' => $custom_linkurl, 'post_excerpt' => $custom_anchor_title, 'tax_input' => array( 'nav_menu' => $menu_title ),
- 'post_content' => $custom_description, 'post_title' => $custom_title );
- if ( $new_window )
- $post['post_content_filtered'] = '_blank';
- else
- $post['post_content_filtered'] = '';
- if ( $parent_id > 0 && isset( $parent_menu_ids[ $parent_id ] ) )
- $post[ 'post_parent' ] = $parent_menu_ids[ $parent_id ];
-
- // New menu item
- if ( $db_id == 0 ) {
- $db_id = wp_insert_post( $post );
- } elseif ( isset( $menu_items[$db_id] ) ) {
- $post['ID'] = $db_id;
- wp_update_post( $post );
- unset( $menu_items[$db_id] );
- }
- $parent_menu_ids[ $k ] = $db_id;
-
- update_post_meta($db_id, 'menu_type', $linktype);
- update_post_meta($db_id, 'object_id', $object_id);
- }
- if ( !empty( $menu_items ) ) {
- foreach ( array_keys( $menu_items ) as $menu_id ) {
- wp_delete_post( $menu_id );
- }
- }
- // DISPLAY SUCCESS MESSAGE IF POST CORRECT
- $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . __('The menu has been updated.') . '</p></div>';
-}
-
-?>
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2 class="maintitle"><?php esc_html_e('Menus') ?></h2>
- <div class="hide-if-js error"><p><?php _e('You do not have JavaScript enabled in your browser. Please enable it to access the Menus functionality.'); ?></p></div>
- <div class="hide-if-no-js">
- <div id="pages-left">
- <ul class="subsubsub">
-<?php if ( ! empty( $custom_menus ) ) {
- foreach ( $custom_menus as $menu ) {
- $sep = end($custom_menus) == $menu ? '' : ' | ';
- // $menu_term = get_term( $menu, 'nav_menu' );
- if ( ( $menu_id_in_edit == $menu->term_id ) || ( $menu_selected_id == $menu->term_id ) ) { ?>
- <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>
-<?php }
- }
- } else { ?>
- <li><?php _e( 'Default' ); ?></li>
-<?php } ?>
- </ul>
- <div class="clear"></div>
- <div class="inside">
- <?php
- // CHECK if custom menu has been enabled
- $enabled_menu = get_option('wp_custom_nav_menu');
- $checked = strtolower($enabled_menu);
-
- if ( $checked != 'true' )
- echo '<div id="message-enabled" class="error fade below-h2"><p><strong>' . __('Menu editing has not been Enabled yet. Please enable it in order to use it -------->') . '</strong></p></div>';
- ?>
- <?php echo $messagesdiv; ?>
- <form onsubmit="updatepostdata()" action="custom-navigation.php" method="post" enctype="multipart/form-data">
-
- <input type="hidden" name="licount" id="licount" value="0" />
- <input type="hidden" name="menu_id_in_edit" id="menu_id_in_edit" value="<?php echo esc_attr($menu_selected_id); ?>" />
-
- <div class="sidebar-name">
-
- <div class="sidebar-name-arrow">
- <br/>
- </div>
- <h3><?php echo esc_html($menu_title); ?></h3>
-
- </div>
-
- <div id="nav-container">
- <ul id="custom-nav">
-
- <?php
- //DISPLAY existing menu
- if ( $menu_selected_id > 0 ) {
- // SET output type
- $output_type = "backend";
- // MAIN OUTPUT FUNCTION
- wp_custom_navigation_output( 'type='.$output_type.'&name='.$menu_title.'&id='.$menu_selected_id );
- }
- ?>
-
- </ul>
- </div><!-- /#nav-container -->
-
- <p class="submit">
-
- <script type="text/javascript">
- updatepostdata();
- </script>
- <!-- <input id="delete_menu" name="delete_menu" type="submit" value="<?php esc_attr_e('Delete This Menu'); ?>" /> -->
- <input id="save_bottom" name="save_bottom" type="submit" value="<?php esc_attr_e('Save All Changes'); ?>" /></p>
- </div><!-- /.inside -->
- </div>
-
- <div id="menu-right">
- <div class="widgets-holder-wrap">
- <div class="sidebar-name">
- <div class="sidebar-name-arrow"></div>
- <h3><?php esc_html_e('Setup Menus'); ?></h3>
- </div>
- <div class="widget-holder">
-
- <?php
- // Setup custom menu
- $enabled_menu = get_option('wp_custom_nav_menu');
- $checked = strtolower($enabled_menu);
- ?>
-
- <span >
- <label><?php _e('Enable'); ?></label><input type="radio" name="enable_wp_menu" value="true" <?php if ($checked=='true') { echo 'checked="checked"'; } ?> />
- <label><?php _e('Disable'); ?></label><input type="radio" name="enable_wp_menu" value="false" <?php if ($checked=='true') { } else { echo 'checked="checked"'; } ?> />
- </span><!-- /.checkboxes -->
-
- <input id="set_wp_menu" type="submit" value="<?php esc_attr_e('Set Menu'); ?>" name="set_wp_menu" class="button" /><br />
-
- <span>
- <label><?php _e('Reset Menu to Default'); ?></label>
- <input id="reset_wp_menu" type="submit" value="Reset" name="reset_wp_menu" class="button" onclick="return confirm('<?php _e('Are you sure you want to reset the menu to its default settings?'); ?>');" />
- </span>
- <br /><br />
- <span>
- <input id="add_menu_name" name="add_menu_name" type="text" value="" />
- <input id="add_menu" type="submit" value="<?php esc_attr_e('Add Menu'); ?>" name="add_menu" class="button" />
- </span>
- </div>
- </div><!-- /.widgets-holder-wrap -->
- <?php $advanced_option_descriptions = get_option('wp_settings_custom_nav_advanced_options'); ?>
- <div class="widgets-holder-wrap" style="display:none;">
- <div class="sidebar-name">
- <div class="sidebar-name-arrow"></div>
- <h3><?php esc_html_e('Top Level Menu Descriptions'); ?></h3>
- </div>
- <div class="widget-holder">
- <span><?php _e('Display Descriptions in Top Level Menu?'); ?></span>
-
- <?php
- // UPDATE and DISPLAY Menu Description Option
- if ( isset($_POST['menu-descriptions']) ) {
- if ( !isset($_POST['switch_menu']) ) {
- $menu_options_to_edit = $_POST['menu_id_in_edit'];
- update_option('wp_settings_custom_nav_'.$menu_options_to_edit.'_descriptions',$_POST['menu-descriptions']);
- }
- }
-
- if ( $menu_id_in_edit > 0 )
- $checkedraw = get_option('wp_settings_custom_nav_'.$menu_id_in_edit.'_descriptions');
- else
- $checkedraw = get_option('wp_settings_custom_nav_'.$menu_selected_id.'_descriptions');
-
- $checked = strtolower($checkedraw);
-
- if ( $advanced_option_descriptions == 'no' )
- $checked = 'no';
- ?>
-
- <span class="checkboxes">
- <label><?php _e('Yes'); ?></label><input type="radio" name="menu-descriptions" value="yes" <?php if ($checked=='yes') { echo 'checked="checked"'; } ?> />
- <label><?php _e('No'); ?></label><input type="radio" name="menu-descriptions" value="no" <?php if ($checked=='yes') { } else { echo 'checked="checked"'; } ?> />
- </span><!-- /.checkboxes -->
- </form>
- <div class="fix"></div>
- </div>
- </div><!-- /.widgets-holder-wrap -->
-
- <div class="widgets-holder-wrap">
- <div class="sidebar-name">
- <div class="sidebar-name-arrow"></div>
- <h3><?php esc_html_e('Add an Existing Page'); ?></h3>
- </div>
- <div class="widget-holder">
-
- <?php
- $pages_args = array(
- 'child_of' => 0,
- 'sort_order' => 'ASC',
- 'sort_column' => 'post_title',
- 'hierarchical' => 1,
- 'exclude' => '',
- 'include' => '',
- 'meta_key' => '',
- 'meta_value' => '',
- 'authors' => '',
- 'parent' => -1,
- 'exclude_tree' => '',
- 'number' => '',
- 'offset' => 0 );
-
- //GET all pages
- $pages_array = get_pages($pages_args);
- $page_name = '';
- //CHECK if pages exist
- if ( $pages_array ) {
- foreach ( $pages_array as $post ) {
- //Add page name to
- $page_name .= htmlentities($post->post_title).'|';
- }
- } else {
- $page_name = __('No pages available');
- }
- ?>
-
- <script>
- jQuery(document).ready(function(){
-
- //GET PHP pages
- var dataposts = "<?php echo esc_js($page_name); ?>".split("|");
-
- //Set autocomplete
- jQuery("#page-search").autocomplete(dataposts);
-
- //Handle autocomplete result
- jQuery("#page-search").result(function(event, data, formatted) {
- jQuery('#existing-pages').css('display','block');
- jQuery("#existing-pages dt:contains('" + data + "')").css("display", "block");
-
- jQuery('#show-pages').hide();
- jQuery('#hide-pages').show();
-
- });
- jQuery('#existing-pages').css('display','none');
- });
- </script>
-
- <input type="text" onfocus="jQuery('#page-search').attr('value','');" id="page-search" value="<?php esc_attr_e('Search Pages'); ?>" />
-
- <a id="show-pages" style="cursor:pointer;" onclick="jQuery('#existing-pages').css('display','block');jQuery('#page-search').attr('value','');jQuery('#existing-pages dt').css('display','block');jQuery('#show-pages').hide();jQuery('#hide-pages').show();">View All</a>
- <a id="hide-pages" style="cursor:pointer;" onclick="jQuery('#existing-pages').css('display','none');jQuery('#page-search').attr('value','Search Pages');jQuery('#existing-pages dt').css('display','none');jQuery('#show-pages').show();jQuery('#hide-pages').hide();">Hide All</a>
-
- <script type="text/javascript">
- jQuery('#hide-pages').hide();
- </script>
-
- <ul id="existing-pages" class="list">
- <?php
- $intCounter = 0;
- //Get default Pages
- $intCounter = wp_custom_nav_get_pages($intCounter,'default');
- ?>
- </ul>
-
- <div class="fix"></div>
-
- </div>
- </div><!-- /.widgets-holder-wrap -->
-
- <div class="widgets-holder-wrap">
- <div class="sidebar-name">
- <div class="sidebar-name-arrow"></div>
- <h3><?php esc_html_e('Add an Existing Category'); ?></h3>
- </div>
- <div class="widget-holder">
-
- <?php
- // Custom GET categories query
- // @todo Use API
- $categories = $wpdb->get_results("SELECT term_id FROM $wpdb->term_taxonomy WHERE taxonomy = 'category' ORDER BY term_id ASC");
- $cat_name = '';
- //CHECK for results
- if ( $categories ) {
- foreach ( $categories as $category ) {
- $cat_id = $category->term_id;
-
- $cat_args = array(
- 'orderby' => 'name',
- 'include' => $cat_id,
- 'hierarchical' => 1,
- 'order' => 'ASC'
- );
-
- $category_names=get_categories($cat_args);
-
- if ( isset($category_names[0]->name) ) {
- // Add category name to data string
- $cat_name .= htmlentities($category_names[0]->name).'|';
- }
- }
- } else {
- $cat_name = __('No categories available');
- }
- ?>
-
- <script>
- jQuery(document).ready(function(){
-
- //GET PHP categories
- var datacats = "<?php echo esc_js($cat_name); ?>".split("|");
-
- //Set autocomplete
- jQuery("#cat-search").autocomplete(datacats);
-
- //Handle autocomplete result
- jQuery("#cat-search").result(function(event, data, formatted) {
- jQuery('#existing-categories').css('display','block');
- jQuery("#existing-categories dt:contains('" + data + "')").css("display", "block");
-
- jQuery('#show-cats').hide();
- jQuery('#hide-cats').show();
-
- });
- jQuery('#existing-categories').css('display','none');
-
- });
- </script>
-
- <input type="text" onfocus="jQuery('#cat-search').attr('value','');" id="cat-search" value="<?php esc_attr_e('Search Categories'); ?>" />
-
- <a id="show-cats" style="cursor:pointer;" onclick="jQuery('#existing-categories').css('display','block');jQuery('#cat-search').attr('value','');jQuery('#existing-categories dt').css('display','block');jQuery('#show-cats').hide();jQuery('#hide-cats').show();">View All</a>
- <a id="hide-cats" style="cursor:pointer;" onclick="jQuery('#existing-categories').css('display','none');jQuery('#cat-search').attr('value','Search Categories');jQuery('#existing-categories dt').css('display','none');jQuery('#show-cats').show();jQuery('#hide-cats').hide();">Hide All</a>
-
- <script type="text/javascript">
- jQuery('#hide-cats').hide();
- </script>
-
- <ul id="existing-categories" class="list">
- <?php
- // Get default Categories
- $intCounter = wp_custom_nav_get_categories($intCounter, 'default');
- ?>
- </ul>
-
- <div class="fix"></div>
-
- </div>
- </div><!-- /.widgets-holder-wrap -->
-
- <div class="widgets-holder-wrap">
- <div class="sidebar-name">
- <div class="sidebar-name-arrow"></div>
- <h3><?php esc_html_e('Add a Custom Url'); ?></h3>
- </div>
- <div class="widget-holder">
- <input id="custom_menu_item_url" type="text" value="http://" />
- <label><?php _e('URL'); ?></label><br />
- <?php $templatedir = get_bloginfo('url'); ?>
- <input type="hidden" id="templatedir" value="<?php echo esc_attr($templatedir); ?>" />
- <input id="custom_menu_item_name" type="text" value="Menu Item" onfocus="jQuery('#custom_menu_item_name').attr('value','');" />
- <label><?php _e('Menu Text'); ?></label><br />
- <input id="custom_menu_item_description" type="text" value="<?php esc_attr_e('A description'); ?>" <?php if ($advanced_option_descriptions == 'no') { ?>style="display:none;"<?php } ?> onfocus="jQuery('#custom_menu_item_description').attr('value','');" />
- <label <?php if ($advanced_option_descriptions == 'no') { ?>style="display:none;"<?php } ?> ><?php _e('Description'); ?></label>
- <a class="addtomenu" onclick="appendToList('<?php echo $templatedir; ?>','Custom','','','','0','');jQuery('#custom_menu_item_name').attr('value','Menu Item');jQuery('#custom_menu_item_description').attr('value','A description');"><?php _e('Add to menu'); ?></a>
- <div class="fix"></div>
- </div>
- </div><!-- /.widgets-holder-wrap -->
- </div><!-- /.hide-if-no-js -->
- </div>
-</div>
-
-<div id="dialog-confirm" style="display:none;" title="<?php esc_attr_e('Edit Menu Item'); ?>">
- </label><input id="edittitle" type="text" name="edittitle" value="" /><label class="editlabel" for="edittitle"><?php _e('Menu Title'); ?></label><br />
- <input id="editlink" type="text" name="editlink" value="" /><label class="editlabel" for="editlink"><?php _e('URL'); ?></label><br />
- <input id="editanchortitle" type="text" name="editanchortitle" value="" /><label class="editlabel" for="editanchortitle"><?php _e('Link Title'); ?></label><br />
- <select id="editnewwindow" name="editnewwindow">
- <option value="1"><?php _e('Yes'); ?></option>
- <option value="0"><?php _e('No'); ?></option>
- </select><label class="editlabel" for="editnewwindow"><?php _e('Open Link in a new window'); ?></label>
- <input id="editdescription" type="text" name="editdescription" value="" <?php if ($advanced_option_descriptions == 'no') { ?>style="display:none;"<?php } ?> /><label class="editlabel" for="editdescription" <?php if ($advanced_option_descriptions == 'no') { ?>style="display:none;"<?php } ?> ><?php _e('Description'); ?></label><br />
-</div>
-
-<?php
-
-include("admin-footer.php");
</del></span></pre></div>
<a id="trunkwpadminincludesnavmenuphp"></a>
<div class="addfile"><h4>Added: trunk/wp-admin/includes/nav-menu.php (0 => 13366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php (rev 0)
+++ trunk/wp-admin/includes/nav-menu.php 2010-02-24 08:06:36 UTC (rev 13366)
</span><span class="lines">@@ -0,0 +1,236 @@
</span><ins>+<?php
+
+/*-----------------------------------------------------------------------------------*/
+/* Custom Navigation Functions */
+/* wp_custom_navigation_output() displays the menu in the back/frontend
+/* wp_custom_nav_get_pages()
+/* wp_custom_nav_get_categories()
+/* wp_custom_navigation_default_sub_items() is a recursive sub menu item function
+/*-----------------------------------------------------------------------------------*/
+
+// Outputs All Pages and Sub Items
+function wp_nav_menu_get_pages($counter, $type) {
+
+ $pages_args = array(
+ 'child_of' => 0,
+ 'sort_order' => 'ASC',
+ 'sort_column' => 'post_title',
+ 'hierarchical' => 1,
+ 'exclude' => '',
+ 'include' => '',
+ 'meta_key' => '',
+ 'meta_value' => '',
+ 'authors' => '',
+ 'parent' => -1,
+ 'exclude_tree' => '',
+ 'number' => '',
+ 'offset' => 0 );
+
+ //GET all pages
+ $pages_array = get_pages($pages_args);
+
+ $intCounter = $counter;
+ $parentli = $intCounter;
+
+ if ( !$pages_array ) {
+ echo 'Not Found';
+ return $intCounter;
+ }
+
+ // Display Loop
+ foreach ( $pages_array as $post ) {
+ if ( $post->post_parent == 0 ) {
+ $post = wp_setup_nav_menu_item($post, 'page', $intCounter);
+ if ( $type == 'menu' ) {
+ ?>
+
+ <li id="menu-<?php echo $intCounter; ?>" value="<?php echo $intCounter; ?>">
+ <?php
+ wp_print_nav_menu_item($post, 'menu', $intCounter);
+ $parentli = $post->ID;
+ $intCounter++;
+ $intCounter = wp_custom_navigation_default_sub_items($post->ID, $intCounter, $parentli, 'pages', 'menu');
+ ?>
+ </li>
+
+ <?php
+ } elseif ( $type == 'default' ) {
+ // Sidebar Menu
+ ?>
+ <li>
+ <?php
+ wp_print_nav_menu_item($post, 'default');
+ $parentli = $post->ID;
+ $intCounter++;
+ $intCounter = wp_nav_menu_sub_items($post->ID, $intCounter, $parentli, 'pages', 'default');
+ ?>
+ </li>
+
+ <?php
+ }
+ }
+ }
+
+ return $intCounter;
+}
+
+// Outputs All Categories and Sub Items
+function wp_nav_menu_get_categories($counter, $type) {
+
+ $category_args = array(
+ 'type' => 'post',
+ 'child_of' => 0,
+ 'orderby' => 'name',
+ 'order' => 'ASC',
+ 'hide_empty' => false,
+ 'include_last_update_time' => false,
+ 'hierarchical' => 1,
+ 'exclude' => '',
+ 'include' => '',
+ 'number' => '',
+ 'pad_counts' => false );
+
+ $intCounter = $counter;
+
+ // Get all categories
+ $categories_array = get_categories($category_args);
+
+ if ( !$categories_array ) {
+ _e('Not Found');
+ return $intCounter;
+ }
+
+ // Display Loop
+ foreach ( $categories_array as $cat_item ) {
+ if ( $cat_item->parent == 0 ) {
+ $cat_item = wp_setup_nav_menu_item($cat_item, 'category', $intCounter);
+ // Custom Menu
+ if ( $type == 'menu' ) {
+ ?>
+
+ <li id="menu-<?php echo $intCounter; ?>" value="<?php echo $intCounter; ?>">
+ <?php
+ wp_print_nav_menu_item($cat_item, 'menu');
+ $parentli = $cat_item->cat_ID;
+ $intCounter++;
+ $intCounter = wp_nav_menu_sub_items($cat_item->cat_ID, $intCounter, $parentli, 'categories', 'menu');
+ ?>
+
+ </li>
+
+ <?php
+ } elseif ( $type == 'default' ) {
+ // Sidebar Menu
+ ?>
+ <li>
+ <?php
+ wp_print_nav_menu_item($cat_item, 'default');
+ $parentli = $cat_item->cat_ID;
+ $intCounter++;
+ $intCounter = wp_nav_menu_sub_items($cat_item->cat_ID, $intCounter, $parentli, 'categories', 'default');
+ ?>
+
+ </li>
+
+ <?php
+ }
+ }
+ }
+
+ return $intCounter;
+}
+
+//RECURSIVE Sub Menu Items of default categories and pages
+function wp_nav_menu_sub_items($childof, $intCounter, $parentli, $type, $output_type) {
+
+ $counter = $intCounter;
+
+ // Custom Menu
+ if ( $output_type == 'menu' ) {
+ $sub_args = array(
+ 'child_of' => $childof,
+ 'hide_empty' => false,
+ 'parent' => $childof);
+ } elseif ( $output_type == 'default' ) {
+ // Sidebar Menu
+ $sub_args = array(
+ 'child_of' => $childof,
+ 'hide_empty' => false,
+ 'parent' => $childof);
+ }
+
+ if ( $type == 'categories' ) {
+ // Get Sub Category Items
+ $item_type = 'category';
+ $sub_array = get_categories($sub_args);
+ } elseif ($type == 'pages') {
+ // Get Sub Page Items
+ $item_type = 'page';
+ $sub_array = get_pages($sub_args);
+ } else {
+ $item_type = 'custom';
+ $sub_array = array();
+ }
+
+
+ if ( $sub_array ) {
+ ?>
+ <ul id="sub-custom-nav-<?php echo $type ?>">
+
+ <?php
+ // Display Loop
+ foreach ( $sub_array as $sub_item ) {
+ $sub_item = wp_setup_nav_menu_item($sub_item, $item_type, $counter);
+
+ if ( $output_type == 'menu' ) {
+ ?>
+ <li id="menu-<?php echo $counter; ?>" value="<?php echo $counter; ?>">
+ <?php
+ wp_print_nav_menu_item($sub_item, 'menu');
+ $counter++;
+ $counter = wp_nav_menu_sub_items($sub_item->ID, $counter, $sub_item->ID, $type, 'menu');
+ ?>
+
+ </li>
+ <?php
+ } elseif ( $output_type == 'default' ) {
+ // Sidebar Menu
+ ?>
+ <li>
+ <?php
+ wp_print_nav_menu_item($sub_item, 'default');
+ //$counter++;
+ $counter = wp_nav_menu_sub_items($sub_item->ID, $counter, $sub_item->ID, $type, 'default');
+ ?>
+ </li>
+
+ <?php
+ }
+ }
+ ?>
+
+ </ul>
+
+ <?php
+ }
+
+ return $counter;
+}
+
+function wp_nav_menu_setup($override = false) {
+ // Custom Navigation Menu Setup
+
+ // Override for menu descriptions
+ update_option('wp_settings_custom_nav_advanced_options', 'yes');
+
+ $menus = wp_get_nav_menus();
+ if ( !empty( $menus ) ) {
+ foreach ( $menus as $menu ) {
+ wp_delete_nav_menu( $menu->term_id );
+ }
+ }
+
+ wp_create_nav_menu( __('Main') );
+}
+
+?>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/wp-admin/includes/nav-menu.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (13365 => 13366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-02-24 07:58:14 UTC (rev 13365)
+++ trunk/wp-admin/menu.php 2010-02-24 08:06:36 UTC (rev 13366)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> $submenu['themes.php'][5] = array(__('Themes'), 'switch_themes', 'themes.php');
</span><span class="cx"> $submenu['themes.php'][10] = array(_x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php');
</span><span class="cx"> $submenu['themes.php'][15] = array(__('Add New Themes'), 'install_themes', 'theme-install.php');
</span><del>- $submenu['themes.php'][20] = array(__('Menus'), 'switch_themes', 'custom-navigation.php');
</del><ins>+ $submenu['themes.php'][20] = array(__('Menus'), 'switch_themes', 'nav-menus.php');
</ins><span class="cx">
</span><span class="cx"> $update_plugins = get_site_transient( 'update_plugins' );
</span><span class="cx"> $update_count = 0;
</span></span></pre></div>
<a id="trunkwpadminnavmenusphpfromrev13363trunkwpadmincustomnavigationphp"></a>
<div class="copfile"><h4>Copied: trunk/wp-admin/nav-menus.php (from rev 13363, trunk/wp-admin/custom-navigation.php) (0 => 13366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php (rev 0)
+++ trunk/wp-admin/nav-menus.php 2010-02-24 08:06:36 UTC (rev 13366)
</span><span class="lines">@@ -0,0 +1,515 @@
</span><ins>+<?php
+/**
+ * WordPress Administration for Navigation Menus
+ * Interface functions
+ *
+ * @author Jeffikus <pearce.jp@gmail.com>
+ * @version 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+require_once('admin.php');
+
+if ( ! current_user_can('switch_themes') )
+ wp_die( __( 'Cheatin&#8217; uh?' ));
+
+wp_admin_css( 'custom-navigation' );
+wp_enqueue_script( 'jquery' );
+wp_enqueue_script( 'jquery-ui-draggable' );
+wp_enqueue_script( 'jquery-ui-droppable' );
+wp_enqueue_script( 'jquery-ui-sortable' );
+wp_enqueue_script( 'jquery-ui-dialog' );
+wp_enqueue_script( 'custom-navigation-dynamic-functions' );
+wp_enqueue_script( 'custom-navigation-default-items' );
+wp_enqueue_script( 'jquery-autocomplete' );
+wp_enqueue_script( 'custom-navigation-php-functions' );
+
+require_once('admin-header.php');
+require_once(ABSPATH . 'wp-admin/includes/nav-menu.php');
+
+function wp_reset_nav_menu() {
+ wp_custom_navigation_setup(true);
+
+ return true;
+}
+
+$messagesdiv = '';
+$menu_id_in_edit = 0;
+$updated = false;
+
+// Check which menu is selected and if menu is in edit already
+if ( isset( $_GET['edit_menu'] ) ) {
+ $menu_selected_id = (int) $_GET['edit_menu'];
+ $updated = true;
+} elseif ( isset( $_POST[ 'menu_id_in_edit' ] ) ) {
+ $menu_selected_id = (int) $_POST[ 'menu_id_in_edit' ];
+} else {
+ $menu_selected_id = 0;
+}
+
+if ( isset( $_POST[ 'delete_menu' ] ) && $menu_selected_id > 0 ) {
+ wp_delete_nav_menu( $menu_selected_id );
+ $menu_selected_id = 0;
+ $updated = true;
+}
+
+// Default Menu to show
+$custom_menus = wp_get_nav_menus();
+if ( ! $menu_selected_id && ! empty( $custom_menus ) )
+ $menu_selected_id = $custom_menus[0]->term_id;
+
+$menu_title = '';
+if ( $menu_selected_id > 0 ) {
+ foreach ( $custom_menus as $menu ) {
+ if ( $menu->term_id == $menu_selected_id ) {
+ $menu_title = $menu->name;
+ break;
+ }
+ }
+}
+
+if ( isset( $_POST['set_wp_menu'] ) ) {
+ // @todo validate set_wp_menu
+ update_option( 'wp_custom_nav_menu', $_POST['enable_wp_menu'] );
+ $updated = true;
+ $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . __('Menu has been updated!') . '</p></div>';
+}
+
+if ( isset( $_POST['licount'] ) )
+ $postCounter = $_POST['licount'];
+else
+ $postCounter = 0;
+
+// Create a new menu. Menus are stored as terms in the 'menu' taxonomy.
+if ( isset( $_POST['add_menu'] ) && ! $updated ) {
+ $insert_menu_name = $_POST['add_menu_name'];
+
+ if ( $insert_menu_name != '' ) {
+ $menu = wp_create_nav_menu($insert_menu_name);
+ if ( is_wp_error($menu) ) {
+ $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . esc_html( $menu->get_error_message() ) . '</p></div>';
+ } else {
+ $custom_menus[$menu->term_id] = $menu;
+ $menu_selected_id = $menu->term_id;
+ $menu_id_in_edit = $menu_selected_id;
+ $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . esc_html( sprintf( __('"%s" menu has been created!'), $menu->name ) ) . '</p></div>';
+ $postCounter = 0;
+ }
+ } else {
+ $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . __('Please enter a valid menu name.') . '</p></div>';
+ }
+ $updated = true;
+}
+
+if ( isset($_POST['reset_wp_menu']) && ! $updated ) {
+ $success = wp_reset_nav_menu();
+ if ( $success ) {
+ // DISPLAY SUCCESS MESSAGE IF Menu Reset Correctly
+ $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . __('The menu has been reset.') . '</p></div>';
+ // GET reset menu id
+ $custom_menus = array();
+ $menu_selected_id = 0;
+ } else {
+ // DISPLAY SUCCESS MESSAGE IF Menu Reset Correctly
+ $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . __('The menu could not be reset. Please try again.') . '</p></div>';
+ }
+} elseif ( $postCounter > 0 && $menu_selected_id > 0 && ! $updated ) {
+ $menu_items = wp_get_nav_menu_items( $menu_selected_id, array('orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID') );
+ $parent_menu_ids = array();
+
+ // Loop through all POST variables
+ for ( $k = 1; $k <= $postCounter; $k++ ) {
+ if (isset($_POST['dbid'.$k])) { $db_id = $_POST['dbid'.$k]; } else { $db_id = 0; }
+ if (isset($_POST['postmenu'.$k])) { $object_id = $_POST['postmenu'.$k]; } else { $object_id = 0; }
+ if (isset($_POST['parent'.$k])) { $parent_id = $_POST['parent'.$k]; } else { $parent_id = 0; }
+ if (isset($_POST['title'.$k])) { $custom_title = $_POST['title'.$k]; } else { $custom_title = ''; }
+ if (isset($_POST['linkurl'.$k])) { $custom_linkurl = $_POST['linkurl'.$k]; } else { $custom_linkurl = ''; }
+ if (isset($_POST['description'.$k])) { $custom_description = $_POST['description'.$k]; } else { $custom_description = ''; }
+ // doesn't seem to be used by UI
+ if (isset($_POST['icon'.$k])) { $icon = $_POST['icon'.$k]; } else { $icon = 0; }
+ if (isset($_POST['position'.$k])) { $position = $_POST['position'.$k]; } else { $position = 0; }
+ if (isset($_POST['linktype'.$k])) { $linktype = $_POST['linktype'.$k]; } else { $linktype = 'custom'; }
+ if (isset($_POST['anchortitle'.$k])) { $custom_anchor_title = $_POST['anchortitle'.$k]; } else { $custom_anchor_title = $custom_title; }
+ if (isset($_POST['newwindow'.$k])) { $new_window = $_POST['newwindow'.$k]; } else { $new_window = 0; }
+
+ $post = array( 'post_status' => 'publish', 'post_type' => 'nav_menu_item', 'post_author' => $user_ID,
+ 'ping_status' => 0, 'post_parent' => 0, 'menu_order' => $position,
+ 'guid' => $custom_linkurl, 'post_excerpt' => $custom_anchor_title, 'tax_input' => array( 'nav_menu' => $menu_title ),
+ 'post_content' => $custom_description, 'post_title' => $custom_title );
+ if ( $new_window )
+ $post['post_content_filtered'] = '_blank';
+ else
+ $post['post_content_filtered'] = '';
+ if ( $parent_id > 0 && isset( $parent_menu_ids[ $parent_id ] ) )
+ $post[ 'post_parent' ] = $parent_menu_ids[ $parent_id ];
+
+ // New menu item
+ if ( $db_id == 0 ) {
+ $db_id = wp_insert_post( $post );
+ } elseif ( isset( $menu_items[$db_id] ) ) {
+ $post['ID'] = $db_id;
+ wp_update_post( $post );
+ unset( $menu_items[$db_id] );
+ }
+ $parent_menu_ids[ $k ] = $db_id;
+
+ update_post_meta($db_id, 'menu_type', $linktype);
+ update_post_meta($db_id, 'object_id', $object_id);
+ }
+ if ( !empty( $menu_items ) ) {
+ foreach ( array_keys( $menu_items ) as $menu_id ) {
+ wp_delete_post( $menu_id );
+ }
+ }
+ // DISPLAY SUCCESS MESSAGE IF POST CORRECT
+ $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . __('The menu has been updated.') . '</p></div>';
+}
+
+?>
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2 class="maintitle"><?php esc_html_e('Menus') ?></h2>
+
+ <div id="no-js"><h3><?php _e('You do not have JavaScript enabled in your browser. Please enable it to access the Menus functionality.'); ?></h3></div>
+ <div id="pages-left">
+ <ul class="subsubsub">
+<?php if ( ! empty( $custom_menus ) ) {
+ foreach ( $custom_menus as $menu ) {
+ $sep = end($custom_menus) == $menu ? '' : ' | ';
+ // $menu_term = get_term( $menu, 'nav_menu' );
+ if ( ( $menu_id_in_edit == $menu->term_id ) || ( $menu_selected_id == $menu->term_id ) ) { ?>
+ <li><?php echo esc_html( $menu->name ) . $sep; ?></li>
+<?php } else { ?>
+ <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 }
+ }
+ } else { ?>
+ <li><?php _e( 'Default' ); ?></li>
+<?php } ?>
+ </ul>
+ <div class="clear"></div>
+ <div class="inside">
+ <?php
+ // CHECK if custom menu has been enabled
+ $enabled_menu = get_option('wp_custom_nav_menu');
+ $checked = strtolower($enabled_menu);
+
+ if ( $checked != 'true' )
+ echo '<div id="message-enabled" class="error fade below-h2"><p><strong>' . __('Menu editing has not been Enabled yet. Please enable it in order to use it -------->') . '</strong></p></div>';
+ ?>
+ <?php echo $messagesdiv; ?>
+ <form onsubmit="updatepostdata()" action="nav-menus.php" method="post" enctype="multipart/form-data">
+
+ <input type="hidden" name="licount" id="licount" value="0" />
+ <input type="hidden" name="menu_id_in_edit" id="menu_id_in_edit" value="<?php echo esc_attr($menu_selected_id); ?>" />
+
+ <div class="sidebar-name">
+
+ <div class="sidebar-name-arrow">
+ <br/>
+ </div>
+ <h3><?php echo esc_html($menu_title); ?></h3>
+
+ </div>
+
+ <div id="nav-container">
+ <ul id="custom-nav">
+
+ <?php
+ //DISPLAY existing menu
+ if ( $menu_selected_id > 0 ) {
+ // SET output type
+ $output_type = "backend";
+ // MAIN OUTPUT FUNCTION
+ wp_print_nav_menu( 'type='.$output_type.'&name='.$menu_title.'&id='.$menu_selected_id );
+ }
+ ?>
+
+ </ul>
+ </div><!-- /#nav-container -->
+
+ <p class="submit">
+
+ <script type="text/javascript">
+ updatepostdata();
+ </script>
+ <!-- <input id="delete_menu" name="delete_menu" type="submit" value="<?php esc_attr_e('Delete This Menu'); ?>" /> -->
+ <input id="save_bottom" name="save_bottom" type="submit" value="<?php esc_attr_e('Save All Changes'); ?>" /></p>
+ </div><!-- /.inside -->
+ </div>
+
+ <div id="menu-right">
+ <div class="widgets-holder-wrap">
+ <div class="sidebar-name">
+ <div class="sidebar-name-arrow"></div>
+ <h3><?php esc_html_e('Setup Menus'); ?></h3>
+ </div>
+ <div class="widget-holder">
+
+ <?php
+ // Setup custom menu
+ $enabled_menu = get_option('wp_custom_nav_menu');
+ $checked = strtolower($enabled_menu);
+ ?>
+
+ <span >
+ <label><?php _e('Enable'); ?></label><input type="radio" name="enable_wp_menu" value="true" <?php if ($checked=='true') { echo 'checked="checked"'; } ?> />
+ <label><?php _e('Disable'); ?></label><input type="radio" name="enable_wp_menu" value="false" <?php if ($checked=='true') { } else { echo 'checked="checked"'; } ?> />
+ </span><!-- /.checkboxes -->
+
+ <input id="set_wp_menu" type="submit" value="<?php esc_attr_e('Set Menu'); ?>" name="set_wp_menu" class="button" /><br />
+
+ <span>
+ <label><?php _e('Reset Menu to Default'); ?></label>
+ <input id="reset_wp_menu" type="submit" value="Reset" name="reset_wp_menu" class="button" onclick="return confirm('<?php _e('Are you sure you want to reset the menu to its default settings?'); ?>');" />
+ </span>
+ <br /><br />
+ <span>
+ <input id="add_menu_name" name="add_menu_name" type="text" value="" />
+ <input id="add_menu" type="submit" value="<?php esc_attr_e('Add Menu'); ?>" name="add_menu" class="button" />
+ </span>
+ </div>
+ </div><!-- /.widgets-holder-wrap -->
+ <?php $advanced_option_descriptions = get_option('wp_settings_custom_nav_advanced_options'); ?>
+ <div class="widgets-holder-wrap" style="display:none;">
+ <div class="sidebar-name">
+ <div class="sidebar-name-arrow"></div>
+ <h3><?php esc_html_e('Top Level Menu Descriptions'); ?></h3>
+ </div>
+ <div class="widget-holder">
+ <span><?php _e('Display Descriptions in Top Level Menu?'); ?></span>
+
+ <?php
+ // UPDATE and DISPLAY Menu Description Option
+ if ( isset($_POST['menu-descriptions']) ) {
+ if ( !isset($_POST['switch_menu']) ) {
+ $menu_options_to_edit = $_POST['menu_id_in_edit'];
+ update_option('wp_settings_custom_nav_'.$menu_options_to_edit.'_descriptions',$_POST['menu-descriptions']);
+ }
+ }
+
+ if ( $menu_id_in_edit > 0 )
+ $checkedraw = get_option('wp_settings_custom_nav_'.$menu_id_in_edit.'_descriptions');
+ else
+ $checkedraw = get_option('wp_settings_custom_nav_'.$menu_selected_id.'_descriptions');
+
+ $checked = strtolower($checkedraw);
+
+ if ( $advanced_option_descriptions == 'no' )
+ $checked = 'no';
+ ?>
+
+ <span class="checkboxes">
+ <label><?php _e('Yes'); ?></label><input type="radio" name="menu-descriptions" value="yes" <?php if ($checked=='yes') { echo 'checked="checked"'; } ?> />
+ <label><?php _e('No'); ?></label><input type="radio" name="menu-descriptions" value="no" <?php if ($checked=='yes') { } else { echo 'checked="checked"'; } ?> />
+ </span><!-- /.checkboxes -->
+ </form>
+ <div class="fix"></div>
+ </div>
+ </div><!-- /.widgets-holder-wrap -->
+
+ <div class="widgets-holder-wrap">
+ <div class="sidebar-name">
+ <div class="sidebar-name-arrow"></div>
+ <h3><?php esc_html_e('Add an Existing Page'); ?></h3>
+ </div>
+ <div class="widget-holder">
+
+ <?php
+ $pages_args = array(
+ 'child_of' => 0,
+ 'sort_order' => 'ASC',
+ 'sort_column' => 'post_title',
+ 'hierarchical' => 1,
+ 'exclude' => '',
+ 'include' => '',
+ 'meta_key' => '',
+ 'meta_value' => '',
+ 'authors' => '',
+ 'parent' => -1,
+ 'exclude_tree' => '',
+ 'number' => '',
+ 'offset' => 0 );
+
+ //GET all pages
+ $pages_array = get_pages($pages_args);
+ $page_name = '';
+ //CHECK if pages exist
+ if ( $pages_array ) {
+ foreach ( $pages_array as $post ) {
+ //Add page name to
+ $page_name .= htmlentities($post->post_title).'|';
+ }
+ } else {
+ $page_name = __('No pages available');
+ }
+ ?>
+
+ <script>
+ jQuery(document).ready(function(){
+
+ //GET PHP pages
+ var dataposts = "<?php echo esc_js($page_name); ?>".split("|");
+
+ //Set autocomplete
+ jQuery("#page-search").autocomplete(dataposts);
+
+ //Handle autocomplete result
+ jQuery("#page-search").result(function(event, data, formatted) {
+ jQuery('#existing-pages').css('display','block');
+ jQuery("#existing-pages dt:contains('" + data + "')").css("display", "block");
+
+ jQuery('#show-pages').hide();
+ jQuery('#hide-pages').show();
+
+ });
+ jQuery('#existing-pages').css('display','none');
+ });
+ </script>
+
+ <input type="text" onfocus="jQuery('#page-search').attr('value','');" id="page-search" value="<?php esc_attr_e('Search Pages'); ?>" />
+
+ <a id="show-pages" style="cursor:pointer;" onclick="jQuery('#existing-pages').css('display','block');jQuery('#page-search').attr('value','');jQuery('#existing-pages dt').css('display','block');jQuery('#show-pages').hide();jQuery('#hide-pages').show();">View All</a>
+ <a id="hide-pages" style="cursor:pointer;" onclick="jQuery('#existing-pages').css('display','none');jQuery('#page-search').attr('value','Search Pages');jQuery('#existing-pages dt').css('display','none');jQuery('#show-pages').show();jQuery('#hide-pages').hide();">Hide All</a>
+
+ <script type="text/javascript">
+ jQuery('#hide-pages').hide();
+ </script>
+
+ <ul id="existing-pages" class="list">
+ <?php
+ $intCounter = 0;
+ //Get default Pages
+ $intCounter = wp_nav_menu_get_pages($intCounter,'default');
+ ?>
+ </ul>
+
+ <div class="fix"></div>
+
+ </div>
+ </div><!-- /.widgets-holder-wrap -->
+
+ <div class="widgets-holder-wrap">
+ <div class="sidebar-name">
+ <div class="sidebar-name-arrow"></div>
+ <h3><?php esc_html_e('Add an Existing Category'); ?></h3>
+ </div>
+ <div class="widget-holder">
+
+ <?php
+ // Custom GET categories query
+ // @todo Use API
+ $categories = $wpdb->get_results("SELECT term_id FROM $wpdb->term_taxonomy WHERE taxonomy = 'category' ORDER BY term_id ASC");
+ $cat_name = '';
+ //CHECK for results
+ if ( $categories ) {
+ foreach ( $categories as $category ) {
+ $cat_id = $category->term_id;
+
+ $cat_args = array(
+ 'orderby' => 'name',
+ 'include' => $cat_id,
+ 'hierarchical' => 1,
+ 'order' => 'ASC'
+ );
+
+ $category_names=get_categories($cat_args);
+
+ if ( isset($category_names[0]->name) ) {
+ // Add category name to data string
+ $cat_name .= htmlentities($category_names[0]->name).'|';
+ }
+ }
+ } else {
+ $cat_name = __('No categories available');
+ }
+ ?>
+
+ <script>
+ jQuery(document).ready(function(){
+
+ //GET PHP categories
+ var datacats = "<?php echo esc_js($cat_name); ?>".split("|");
+
+ //Set autocomplete
+ jQuery("#cat-search").autocomplete(datacats);
+
+ //Handle autocomplete result
+ jQuery("#cat-search").result(function(event, data, formatted) {
+ jQuery('#existing-categories').css('display','block');
+ jQuery("#existing-categories dt:contains('" + data + "')").css("display", "block");
+
+ jQuery('#show-cats').hide();
+ jQuery('#hide-cats').show();
+
+ });
+ jQuery('#existing-categories').css('display','none');
+
+ });
+ </script>
+
+ <input type="text" onfocus="jQuery('#cat-search').attr('value','');" id="cat-search" value="<?php esc_attr_e('Search Categories'); ?>" />
+
+ <a id="show-cats" style="cursor:pointer;" onclick="jQuery('#existing-categories').css('display','block');jQuery('#cat-search').attr('value','');jQuery('#existing-categories dt').css('display','block');jQuery('#show-cats').hide();jQuery('#hide-cats').show();">View All</a>
+ <a id="hide-cats" style="cursor:pointer;" onclick="jQuery('#existing-categories').css('display','none');jQuery('#cat-search').attr('value','Search Categories');jQuery('#existing-categories dt').css('display','none');jQuery('#show-cats').show();jQuery('#hide-cats').hide();">Hide All</a>
+
+ <script type="text/javascript">
+ jQuery('#hide-cats').hide();
+ </script>
+
+ <ul id="existing-categories" class="list">
+ <?php
+ // Get default Categories
+ $intCounter = wp_nav_menu_get_categories($intCounter, 'default');
+ ?>
+ </ul>
+
+ <div class="fix"></div>
+
+ </div>
+ </div><!-- /.widgets-holder-wrap -->
+
+ <div class="widgets-holder-wrap">
+ <div class="sidebar-name">
+ <div class="sidebar-name-arrow"></div>
+ <h3><?php esc_html_e('Add a Custom Url'); ?></h3>
+ </div>
+ <div class="widget-holder">
+ <input id="custom_menu_item_url" type="text" value="http://" />
+ <label><?php _e('URL'); ?></label><br />
+ <?php $templatedir = get_bloginfo('url'); ?>
+ <input type="hidden" id="templatedir" value="<?php echo esc_attr($templatedir); ?>" />
+ <input id="custom_menu_item_name" type="text" value="Menu Item" onfocus="jQuery('#custom_menu_item_name').attr('value','');" />
+ <label><?php _e('Menu Text'); ?></label><br />
+ <input id="custom_menu_item_description" type="text" value="<?php esc_attr_e('A description'); ?>" <?php if ($advanced_option_descriptions == 'no') { ?>style="display:none;"<?php } ?> onfocus="jQuery('#custom_menu_item_description').attr('value','');" />
+ <label <?php if ($advanced_option_descriptions == 'no') { ?>style="display:none;"<?php } ?> ><?php _e('Description'); ?></label>
+ <a class="addtomenu" onclick="appendToList('<?php echo $templatedir; ?>','Custom','','','','0','');jQuery('#custom_menu_item_name').attr('value','Menu Item');jQuery('#custom_menu_item_description').attr('value','A description');"><?php _e('Add to menu'); ?></a>
+ <div class="fix"></div>
+ </div>
+ </div><!-- /.widgets-holder-wrap -->
+
+ </div>
+</div>
+
+<script type="text/javascript">
+ document.getElementById('pages-left').style.display='block';
+ document.getElementById('menu-right').style.display='block';
+ document.getElementById('no-js').style.display='none';
+</script>
+
+<div id="dialog-confirm" title="<?php esc_attr_e('Edit Menu Item'); ?>">
+ </label><input id="edittitle" type="text" name="edittitle" value="" /><label class="editlabel" for="edittitle"><?php _e('Menu Title'); ?></label><br />
+ <input id="editlink" type="text" name="editlink" value="" /><label class="editlabel" for="editlink"><?php _e('URL'); ?></label><br />
+ <input id="editanchortitle" type="text" name="editanchortitle" value="" /><label class="editlabel" for="editanchortitle"><?php _e('Link Title'); ?></label><br />
+ <select id="editnewwindow" name="editnewwindow">
+ <option value="1"><?php _e('Yes'); ?></option>
+ <option value="0"><?php _e('No'); ?></option>
+ </select><label class="editlabel" for="editnewwindow"><?php _e('Open Link in a new window'); ?></label>
+ <input id="editdescription" type="text" name="editdescription" value="" <?php if ($advanced_option_descriptions == 'no') { ?>style="display:none;"<?php } ?> /><label class="editlabel" for="editdescription" <?php if ($advanced_option_descriptions == 'no') { ?>style="display:none;"<?php } ?> ><?php _e('Description'); ?></label><br />
+</div>
+
+<?php
+
+include("admin-footer.php");
</ins></span></pre></div>
<a id="trunkwpincludescustomnavigationphp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-includes/custom-navigation.php (13365 => 13366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/custom-navigation.php 2010-02-24 07:58:14 UTC (rev 13365)
+++ trunk/wp-includes/custom-navigation.php 2010-02-24 08:06:36 UTC (rev 13366)
</span><span class="lines">@@ -1,542 +0,0 @@
</span><del>-<?php
-/**
- * WordPress Administration Custom Navigation
- * General Functions
- *
- * @author Jeffikus <pearce.jp@gmail.com>
- * @version 1.1.0
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-function wp_custom_navigation_setup($override = false) {
- // Custom Navigation Menu Setup
-
- // Override for menu descriptions
- update_option('wp_settings_custom_nav_advanced_options', 'yes');
-
- $menus = wp_get_nav_menus();
- if ( !empty( $menus ) ) {
- foreach ( $menus as $menu ) {
- wp_delete_nav_menu( $menu->term_id );
- }
- }
-
- wp_create_nav_menu( __('Main') );
-}
-
-function wp_delete_nav_menu( $menu_id ) {
- $menu_id = (int) $menu_id;
- if ( !$menu_id )
- return false;
-
- $menu_objects = get_objects_in_term( $menu_id, 'nav_menu' );
- if ( !empty( $menu_objects ) ) {
- foreach ( $menu_objects as $item ) {
- wp_delete_post( $item );
- }
- }
- wp_delete_term( $menu_id, 'nav_menu' );
-}
-
-function wp_create_nav_menu( $menu_name ) {
- $menu_exists = get_term_by( 'name', $menu_name, 'nav_menu' );
-
- if ( $menu_exists )
- return WP_Error('menu_exists', sprintf( __('A menu named "%s" already exists; please try another name.'), $menu_exists->name ));
-
- $menu = wp_insert_term( $menu_name, 'nav_menu' );
- if ( is_wp_error($menu) )
- return $menu;
-
- return get_term( $menu['term_id'], 'nav_menu');
-}
-
-function wp_get_nav_menu( $menu ) {
- return get_term( (int) $menu, 'nav_menu');
-}
-
-function wp_get_nav_menus() {
- return get_terms( 'nav_menu', array( 'hide_empty' => false ) );
-}
-
-function wp_get_nav_menu_items( $menu, $args = array() ) {
- $items = get_objects_in_term( (int) $menu, 'nav_menu' );
-
- if ( ! empty( $items ) ) {
- $defaults = array( 'orderby' => 'menu_order', 'post_type' => 'nav_menu_item', 'post_status' => 'publish', 'output' => ARRAY_A, 'output_key' => 'menu_order' );
- $args = wp_parse_args($args, $defaults);
- if ( count( $items ) > 1 )
- $args['include'] = implode( ',', $items );
- else
- $args['include'] = $items[0];
-
- $items = get_posts( $args );
-
- if ( ARRAY_A == $args['output'] ) {
- $output = array();
- foreach ( $items as $item ) {
- $output[$item->$args['output_key']] = $item;
- }
- unset($items);
- ksort($output);
- return $output;
- }
- }
- return $items;
-}
-
-function setup_menu_item($menu_item, $type = 'item', $position = 0) {
- global $parent_menu_order;
-
- if ( 'item' == $type ) {
- $menu_item->type = get_post_meta($menu_item->ID, 'menu_type', true);
- $menu_item->object_id = get_post_meta($menu_item->ID, 'object_id', true);
- if ( isset( $parent_menu_order[ $menu_item->post_parent ] ) )
- $menu_item->parent_item = $parent_menu_order[ $menu_item->post_parent ];
- else
- $menu_item->parent_item = 0;
- } elseif ( 'category' == $type ) {
- $menu_item->type = $type;
- $menu_item->object_id = $menu_item->term_id;
- $menu_item->ID = $menu_item->term_id;
- $menu_item->parent_item = $menu_item->parent;
- $menu_item->menu_order = $position;
- } elseif ( 'page' == $type ) {
- $menu_item->type = $type;
- $menu_item->object_id = $menu_item->ID;
- $menu_item->parent_item = $menu_item->post_parent;
- $menu_item->menu_order = $position;
- }
-
- switch ( $menu_item->type ) {
- // Page Menu Item
- case 'page':
- if ( $menu_item->guid == '' )
- $menu_item->link = get_permalink( $menu_item->object_id );
- else
- $menu_item->link = $menu_item->guid;
-
- if ( $menu_item->post_title == '' )
- $menu_item->title = htmlentities( get_the_title( $menu_item->object_id ) );
- else
- $menu_item->title = htmlentities( $menu_item->post_title );
-
- if ( $menu_item->post_content == '' )
- $menu_item->description = htmlentities( get_post_meta( $menu_item->ID, 'page-description', true ) );
- else
- $menu_item->description = htmlentities( $menu_item->post_content );
- $menu_item->target = '';
- $menu_item->append = 'Page';
- break;
- // Category Menu Item
- case 'category':
- if ( empty($menu_item->guid) )
- $menu_item->link = get_category_link( $menu_item->object_id );
- else
- $menu_item->link = $menu_item->guid;
-
- if ( empty($menu_item->post_title) ) {
- $title_raw = get_category( $menu_item->object_id );
- $menu_item->title = htmlentities($title_raw->cat_name);
- } else {
- $menu_item->title = htmlentities( $menu_item->post_title );
- }
-
- if ( empty($menu_item->post_content) )
- $menu_item->description = htmlentities( strip_tags( category_description( $menu_item->object_id ) ) );
- else
- $menu_item->description = htmlentities( $menu_item->post_content );
- $menu_item->target = '';
- $menu_item->append = 'Category';
- break;
- default:
- // Custom Menu Item
- $menu_item->link = $menu_item->guid;
- $menu_item->title = htmlentities( $menu_item->post_title );
- $menu_item->description = htmlentities( $menu_item->post_content );
- $menu_item->target = 'target="_blank"';
- $menu_item->append = 'Custom';
- break;
- }
-
- $menu_item->li_class = '';
- global $wp_query;
- if ( $menu_item->ID == $wp_query->get_queried_object_id() )
- $menu_item->li_class = 'class="current_page_item"';
-
- $menu_item->anchor_title = '';
-/* @todo: update to use tax/post data
-
- //SET anchor title
- if (isset($wp_custom_nav_menu_items->custom_anchor_title)) {
- $anchor_title = htmlentities($wp_custom_nav_menu_items->custom_anchor_title);
- }
- else {
- $anchor_title = $title;
- }
-
- if ($queried_id == $wp_custom_nav_menu_items->post_id) {
- $li_class = 'class="current_page_item"';
- }
-
- if (isset($wp_custom_nav_menu_items->new_window)) {
- if ($wp_custom_nav_menu_items->new_window > 0) {
- $target = 'target="_blank"';
- }
- else {
- $target = '';
- }
- }
-*/
-
- return $menu_item;
-}
-
-function output_menu_item($menu_item, $context, $args = array() ) {
- switch( $context ) {
- case 'backend':
- case 'menu':
-?>
- <dl>
- <dt>
- <span class="title"><?php echo esc_html($menu_item->title); ?></span>
- <span class="controls">
- <span class="type"><?php echo esc_html($menu_item->type); ?></span>
- <a id="edit<?php echo $menu_item->menu_order; ?>" onclick="edititem(<?php echo $menu_item->menu_order; ?>)" value="<?php echo $menu_item->menu_order; ?>"><img class="edit" alt="<?php esc_attr_e('Edit Menu Item'); ?>" title="<?php esc_attr_e('Edit Menu Item'); ?>" src="<?php echo admin_url('images/ico-edit.png'); ?>" /></a>
- <a id="remove<?php echo $menu_item->menu_order; ?>" onclick="removeitem(<?php echo $menu_item->menu_order; ?>)" value="<?php echo $menu_item->menu_order; ?>"><img class="remove" alt="<?php esc_attr_e('Remove from Custom Menu'); ?>" title="<?php esc_attr_e('Remove from Custom Menu'); ?>" src="<?php echo admin_url('images/ico-close.png'); ?>" /></a>
- <a id="view<?php echo $menu_item->menu_order; ?>" target="_blank" href="<?php echo $menu_item->link; ?>"><img alt="<?php esc_attr_e('View Page'); ?>" title="<?php esc_attr_e('View Page'); ?>" src="<?php echo admin_url('images/ico-viewpage.png'); ?>" /></a>
- </span>
- </dt>
- </dl>
- <?php if ( 'backend' == $context ) { ?>
- <a><span class=""></span></a>
- <?php } else { ?>
- <a class="hide" href="<?php echo $menu_item->link; ?>"><?php echo $menu_item->title; ?></a>
- <?php } ?>
- <input type="hidden" name="dbid<?php echo $menu_item->menu_order; ?>" id="dbid<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->ID; ?>" />
- <input type="hidden" name="postmenu<?php echo $menu_item->menu_order; ?>" id="postmenu<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->ID; ?>" />
- <input type="hidden" name="parent<?php echo $menu_item->menu_order; ?>" id="parent<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->parent_item; ?>" />
- <input type="hidden" name="title<?php echo $menu_item->menu_order; ?>" id="title<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->title; ?>" />
- <input type="hidden" name="linkurl<?php echo $menu_item->menu_order; ?>" id="linkurl<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->link; ?>" />
- <input type="hidden" name="description<?php echo $menu_item->menu_order; ?>" id="description<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->description; ?>" />
- <input type="hidden" name="icon<?php echo $menu_item->menu_order; ?>" id="icon<?php echo $menu_item->menu_order; ?>" value="0" />
- <input type="hidden" name="position<?php echo $menu_item->menu_order; ?>" id="position<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->menu_order; ?>" />
- <input type="hidden" name="linktype<?php echo $menu_item->menu_order; ?>" id="linktype<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->type; ?>" />
- <input type="hidden" name="anchortitle<?php echo $menu_item->menu_order; ?>" id="anchortitle<?php echo $menu_item->menu_order; ?>" value="<?php echo esc_html( $menu_item->post_excerpt ); ?>" />
- <input type="hidden" name="newwindow<?php echo $menu_item->menu_order; ?>" id="newwindow<?php echo $menu_item->menu_order; ?>" value="<?php echo ( '' == $menu_item->post_content_filtered ? '0' : '1' ); ?>" />
-<?php
- break;
-
- case 'frontend':
- // Override for menu descriptions
- $advanced_option_descriptions = get_option('wp_settings_custom_nav_advanced_options');
- if ( $advanced_option_descriptions == 'no' )
- $args['desc'] = 2;
-?>
- <a title="<?php echo $menu_item->anchor_title; ?>" href="<?php echo $menu_item->link; ?>" <?php echo $menu_item->target; ?>><?php echo $args['before_title'] . $menu_item->title . $args['after_title']; ?><?php
-
- if ( $advanced_option_descriptions == 'no' ) {
- // 2 widget override do NOT display descriptions
- // 1 widget override display descriptions
- // 0 widget override not set
- if ( ($args['desc'] == 1) || ($args['desc'] == 0) ) {
- ?><span class="nav-description"><?php echo $menu_item->description; ?></span><?php
- }
- } else {
- // 2 widget override do NOT display descriptions
- // 1 widget override display descriptions
- // 0 widget override not set
- if ( $args['desc'] == 1 ) {
- ?><span class="nav-description"><?php echo $menu_item->description; ?></span><?php
- }
- }
- ?></a>
-<?php
- break;
-
- case 'default':
- $templatedir = get_bloginfo('url');
-?>
- <dl>
- <dt>
- <span class="title"><?php echo $menu_item->title; ?></span> <a onclick="appendToList('<?php echo $templatedir; ?>','<?php echo $menu_item->append; ?>','<?php echo $menu_item->title; ?>','<?php echo $menu_item->link; ?>','<?php echo $menu_item->ID; ?>','<?php echo $menu_item->parent_item ?>','<?php echo $menu_item->description; ?>')" name="<?php echo $menu_item->title; ?>" value="<?php echo $menu_item->link; ?>"><img alt="<?php esc_attr_e('Add to Custom Menu'); ?>" title="<?php esc_attr_e('Add to Custom Menu'); ?>" src="<?php echo admin_url('images/ico-add.png'); ?>" /></a> </dt>
- </dl>
-<?php
- break;
- }
-}
-
-/*-----------------------------------------------------------------------------------*/
-/* Custom Navigation Functions */
-/* wp_custom_navigation_output() displays the menu in the back/frontend
-/* wp_custom_nav_get_pages()
-/* wp_custom_nav_get_categories()
-/* wp_custom_navigation_default_sub_items() is a recursive sub menu item function
-/*-----------------------------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------------*/
-/* Main Output Function
-/* args list
-/* type - frontend or backend
-/* name - name of your menu
-/* id - id of menu in db
-/* desc - 1 = show descriptions, 2 = dont show descriptions
-/* before_title - html before title is outputted in <a> tag
-/* after_title - html after title is outputted in <a> tag
-/*-----------------------------------------------------------------------------------*/
-function wp_custom_navigation_output( $args = array() ) {
- // Defaults
- $defaults = array( 'type' => 'frontend', 'name' => 'Menu 1', 'id' => 0, 'desc' => 2, 'before_title' => '', 'after_title' => '');
-
- $args = wp_parse_args($args, $defaults);
- extract($args, EXTR_SKIP);
-
- $menu_items = wp_get_nav_menu_items( $id );
-
- $parent_stack = array();
- $current_parent = 0;
- $parent_menu_order = array();
- // Setup parentage
- foreach ( $menu_items as $menu_item ) {
- $parent_menu_order[ $menu_item->ID ] = $menu_item->menu_order;
- }
-
- // Display Loop
- foreach ( $menu_items as $key => $menu_item ) {
- $menu_item = setup_menu_item($menu_item);
- // List Items
- ?><li id="menu-<?php echo $menu_item->ID; ?>" value="<?php echo $menu_item->ID; ?>" <?php echo $menu_item->li_class; ?>><?php
- output_menu_item($menu_item, $type, $args);
- // Indent children
- $last_item = ( count( $menu_items ) == $menu_item->menu_order );
- if ( $last_item || $current_parent != $menu_items[ $key + 1 ]->post_parent ) {
- if ( $last_item || in_array( $menu_items[ $key + 1 ]->post_parent, $parent_stack ) ) { ?>
- </li>
-<?php while ( !empty( $parent_stack ) && ($last_item || $menu_items[ $key + 1 ]->post_parent != $current_parent ) ) { ?>
- </ul>
- </li>
-<?php $current_parent = array_pop( $parent_stack );
- } ?>
-<?php } else {
- array_push( $parent_stack, $current_parent );
- $current_parent = $menu_item->ID; ?>
- <ul>
-<?php }
- } else { ?>
- </li>
-<?php }
- }
-}
-
-// Outputs All Pages and Sub Items
-function wp_custom_nav_get_pages($counter, $type) {
-
- $pages_args = array(
- 'child_of' => 0,
- 'sort_order' => 'ASC',
- 'sort_column' => 'post_title',
- 'hierarchical' => 1,
- 'exclude' => '',
- 'include' => '',
- 'meta_key' => '',
- 'meta_value' => '',
- 'authors' => '',
- 'parent' => -1,
- 'exclude_tree' => '',
- 'number' => '',
- 'offset' => 0 );
-
- //GET all pages
- $pages_array = get_pages($pages_args);
-
- $intCounter = $counter;
- $parentli = $intCounter;
-
- if ( !$pages_array ) {
- echo 'Not Found';
- return $intCounter;
- }
-
- // Display Loop
- foreach ( $pages_array as $post ) {
- if ( $post->post_parent == 0 ) {
- $post = setup_menu_item($post, 'page', $intCounter);
- if ( $type == 'menu' ) {
- ?>
-
- <li id="menu-<?php echo $intCounter; ?>" value="<?php echo $intCounter; ?>">
- <?php
- output_menu_item($post, 'menu', $intCounter);
- $parentli = $post->ID;
- $intCounter++;
- $intCounter = wp_custom_navigation_default_sub_items($post->ID, $intCounter, $parentli, 'pages', 'menu');
- ?>
- </li>
-
- <?php
- } elseif ( $type == 'default' ) {
- // Sidebar Menu
- ?>
- <li>
- <?php
- output_menu_item($post, 'default');
- $parentli = $post->ID;
- $intCounter++;
- $intCounter = wp_custom_navigation_default_sub_items($post->ID, $intCounter, $parentli, 'pages', 'default');
- ?>
- </li>
-
- <?php
- }
- }
- }
-
- return $intCounter;
-}
-
-// Outputs All Categories and Sub Items
-function wp_custom_nav_get_categories($counter, $type) {
-
- $category_args = array(
- 'type' => 'post',
- 'child_of' => 0,
- 'orderby' => 'name',
- 'order' => 'ASC',
- 'hide_empty' => false,
- 'include_last_update_time' => false,
- 'hierarchical' => 1,
- 'exclude' => '',
- 'include' => '',
- 'number' => '',
- 'pad_counts' => false );
-
- $intCounter = $counter;
-
- // Get all categories
- $categories_array = get_categories($category_args);
-
- if ( !$categories_array ) {
- _e('Not Found');
- return $intCounter;
- }
-
- // Display Loop
- foreach ( $categories_array as $cat_item ) {
- if ( $cat_item->parent == 0 ) {
- $cat_item = setup_menu_item($cat_item, 'category', $intCounter);
- // Custom Menu
- if ( $type == 'menu' ) {
- ?>
-
- <li id="menu-<?php echo $intCounter; ?>" value="<?php echo $intCounter; ?>">
- <?php
- output_menu_item($cat_item, 'menu');
- $parentli = $cat_item->cat_ID;
- $intCounter++;
- $intCounter = wp_custom_navigation_default_sub_items($cat_item->cat_ID, $intCounter, $parentli, 'categories', 'menu');
- ?>
-
- </li>
-
- <?php
- } elseif ( $type == 'default' ) {
- // Sidebar Menu
- ?>
- <li>
- <?php
- output_menu_item($cat_item, 'default');
- $parentli = $cat_item->cat_ID;
- $intCounter++;
- $intCounter = wp_custom_navigation_default_sub_items($cat_item->cat_ID, $intCounter, $parentli, 'categories', 'default');
- ?>
-
- </li>
-
- <?php
- }
- }
- }
-
- return $intCounter;
-}
-
-//RECURSIVE Sub Menu Items of default categories and pages
-function wp_custom_navigation_default_sub_items($childof, $intCounter, $parentli, $type, $output_type) {
-
- $counter = $intCounter;
-
- // Custom Menu
- if ( $output_type == 'menu' ) {
- $sub_args = array(
- 'child_of' => $childof,
- 'hide_empty' => false,
- 'parent' => $childof);
- } elseif ( $output_type == 'default' ) {
- // Sidebar Menu
- $sub_args = array(
- 'child_of' => $childof,
- 'hide_empty' => false,
- 'parent' => $childof);
- }
-
- if ( $type == 'categories' ) {
- // Get Sub Category Items
- $item_type = 'category';
- $sub_array = get_categories($sub_args);
- } elseif ($type == 'pages') {
- // Get Sub Page Items
- $item_type = 'page';
- $sub_array = get_pages($sub_args);
- } else {
- $item_type = 'custom';
- $sub_array = array();
- }
-
-
- if ( $sub_array ) {
- ?>
- <ul id="sub-custom-nav-<?php echo $type ?>">
-
- <?php
- // Display Loop
- foreach ( $sub_array as $sub_item ) {
- $sub_item = setup_menu_item($sub_item, $item_type, $counter);
-
- if ( $output_type == 'menu' ) {
- ?>
- <li id="menu-<?php echo $counter; ?>" value="<?php echo $counter; ?>">
- <?php
- output_menu_item($sub_item, 'menu');
- $counter++;
- $counter = wp_custom_navigation_default_sub_items($sub_item->ID, $counter, $sub_item->ID, $type, 'menu');
- ?>
-
- </li>
- <?php
- } elseif ( $output_type == 'default' ) {
- // Sidebar Menu
- ?>
- <li>
- <?php
- output_menu_item($sub_item, 'default');
- //$counter++;
- $counter = wp_custom_navigation_default_sub_items($sub_item->ID, $counter, $sub_item->ID, $type, 'default');
- ?>
- </li>
-
- <?php
- }
- }
- ?>
-
- </ul>
-
- <?php
- }
-
- return $counter;
-}
-
-?>
</del></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (13365 => 13366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-02-24 07:58:14 UTC (rev 13365)
+++ trunk/wp-includes/general-template.php 2010-02-24 08:06:36 UTC (rev 13366)
</span><span class="lines">@@ -2215,16 +2215,4 @@
</span><span class="cx"> return apply_filters( "get_the_generator_{$type}", $gen, $type );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
- * 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);
-}
-
</del><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="addfile"><h4>Added: trunk/wp-includes/nav-menu-template.php (0 => 13366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php (rev 0)
+++ trunk/wp-includes/nav-menu-template.php 2010-02-24 08:06:36 UTC (rev 13366)
</span><span class="lines">@@ -0,0 +1,132 @@
</span><ins>+<?php
+
+/**
+ * Outputs a navigation menu.
+ *
+ * @since 3.0.0
+ *
+ * @param array $args Arguments
+ */
+function wp_nav_menu( $args = array() ) {
+ wp_print_nav_menu($args);
+}
+
+function wp_print_nav_menu( $args = array() ) {
+ // Defaults
+ $defaults = array( 'type' => 'frontend', 'name' => 'Menu 1', 'id' => 0, 'desc' => 2, 'before_title' => '', 'after_title' => '');
+
+ $args = wp_parse_args($args, $defaults);
+ extract($args, EXTR_SKIP);
+
+ $menu_items = wp_get_nav_menu_items( $id );
+
+ $parent_stack = array();
+ $current_parent = 0;
+ $parent_menu_order = array();
+ // Setup parentage
+ foreach ( $menu_items as $menu_item ) {
+ $parent_menu_order[ $menu_item->ID ] = $menu_item->menu_order;
+ }
+
+ // Display Loop
+ foreach ( $menu_items as $key => $menu_item ) {
+ $menu_item = wp_setup_nav_menu_item($menu_item);
+ // List Items
+ ?><li id="menu-<?php echo $menu_item->ID; ?>" value="<?php echo $menu_item->ID; ?>" <?php echo $menu_item->li_class; ?>><?php
+ wp_print_nav_menu_item($menu_item, $type, $args);
+ // Indent children
+ $last_item = ( count( $menu_items ) == $menu_item->menu_order );
+ if ( $last_item || $current_parent != $menu_items[ $key + 1 ]->post_parent ) {
+ if ( $last_item || in_array( $menu_items[ $key + 1 ]->post_parent, $parent_stack ) ) { ?>
+ </li>
+<?php while ( !empty( $parent_stack ) && ($last_item || $menu_items[ $key + 1 ]->post_parent != $current_parent ) ) { ?>
+ </ul>
+ </li>
+<?php $current_parent = array_pop( $parent_stack );
+ } ?>
+<?php } else {
+ array_push( $parent_stack, $current_parent );
+ $current_parent = $menu_item->ID; ?>
+ <ul>
+<?php }
+ } else { ?>
+ </li>
+<?php }
+ }
+}
+
+function wp_print_nav_menu_item($menu_item, $context, $args = array() ) {
+ switch ( $context ) {
+ case 'backend':
+ case 'menu':
+?>
+ <dl>
+ <dt>
+ <span class="title"><?php echo esc_html($menu_item->title); ?></span>
+ <span class="controls">
+ <span class="type"><?php echo esc_html($menu_item->type); ?></span>
+ <a id="edit<?php echo $menu_item->menu_order; ?>" onclick="edititem(<?php echo $menu_item->menu_order; ?>)" value="<?php echo $menu_item->menu_order; ?>"><img class="edit" alt="<?php esc_attr_e('Edit Menu Item'); ?>" title="<?php esc_attr_e('Edit Menu Item'); ?>" src="<?php echo admin_url('images/ico-edit.png'); ?>" /></a>
+ <a id="remove<?php echo $menu_item->menu_order; ?>" onclick="removeitem(<?php echo $menu_item->menu_order; ?>)" value="<?php echo $menu_item->menu_order; ?>"><img class="remove" alt="<?php esc_attr_e('Remove from Custom Menu'); ?>" title="<?php esc_attr_e('Remove from Custom Menu'); ?>" src="<?php echo admin_url('images/ico-close.png'); ?>" /></a>
+ <a id="view<?php echo $menu_item->menu_order; ?>" target="_blank" href="<?php echo $menu_item->link; ?>"><img alt="<?php esc_attr_e('View Page'); ?>" title="<?php esc_attr_e('View Page'); ?>" src="<?php echo admin_url('images/ico-viewpage.png'); ?>" /></a>
+ </span>
+ </dt>
+ </dl>
+ <?php if ( 'backend' == $context ) { ?>
+ <a><span class=""></span></a>
+ <?php } else { ?>
+ <a class="hide" href="<?php echo $menu_item->link; ?>"><?php echo $menu_item->title; ?></a>
+ <?php } ?>
+ <input type="hidden" name="dbid<?php echo $menu_item->menu_order; ?>" id="dbid<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->ID; ?>" />
+ <input type="hidden" name="postmenu<?php echo $menu_item->menu_order; ?>" id="postmenu<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->ID; ?>" />
+ <input type="hidden" name="parent<?php echo $menu_item->menu_order; ?>" id="parent<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->parent_item; ?>" />
+ <input type="hidden" name="title<?php echo $menu_item->menu_order; ?>" id="title<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->title; ?>" />
+ <input type="hidden" name="linkurl<?php echo $menu_item->menu_order; ?>" id="linkurl<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->link; ?>" />
+ <input type="hidden" name="description<?php echo $menu_item->menu_order; ?>" id="description<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->description; ?>" />
+ <input type="hidden" name="icon<?php echo $menu_item->menu_order; ?>" id="icon<?php echo $menu_item->menu_order; ?>" value="0" />
+ <input type="hidden" name="position<?php echo $menu_item->menu_order; ?>" id="position<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->menu_order; ?>" />
+ <input type="hidden" name="linktype<?php echo $menu_item->menu_order; ?>" id="linktype<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->type; ?>" />
+ <input type="hidden" name="anchortitle<?php echo $menu_item->menu_order; ?>" id="anchortitle<?php echo $menu_item->menu_order; ?>" value="<?php echo esc_html( $menu_item->post_excerpt ); ?>" />
+ <input type="hidden" name="newwindow<?php echo $menu_item->menu_order; ?>" id="newwindow<?php echo $menu_item->menu_order; ?>" value="<?php echo ( '' == $menu_item->post_content_filtered ? '0' : '1' ); ?>" />
+<?php
+ break;
+
+ case 'frontend':
+ // Override for menu descriptions
+ $advanced_option_descriptions = get_option('wp_settings_custom_nav_advanced_options');
+ if ( $advanced_option_descriptions == 'no' )
+ $args['desc'] = 2;
+?>
+ <a title="<?php echo $menu_item->anchor_title; ?>" href="<?php echo $menu_item->link; ?>" <?php echo $menu_item->target; ?>><?php echo $args['before_title'] . $menu_item->title . $args['after_title']; ?><?php
+
+ if ( $advanced_option_descriptions == 'no' ) {
+ // 2 widget override do NOT display descriptions
+ // 1 widget override display descriptions
+ // 0 widget override not set
+ if ( ($args['desc'] == 1) || ($args['desc'] == 0) ) {
+ ?><span class="nav-description"><?php echo $menu_item->description; ?></span><?php
+ }
+ } else {
+ // 2 widget override do NOT display descriptions
+ // 1 widget override display descriptions
+ // 0 widget override not set
+ if ( $args['desc'] == 1 ) {
+ ?><span class="nav-description"><?php echo $menu_item->description; ?></span><?php
+ }
+ }
+ ?></a>
+<?php
+ break;
+
+ case 'default':
+ $templatedir = get_bloginfo('url');
+?>
+ <dl>
+ <dt>
+ <span class="title"><?php echo $menu_item->title; ?></span> <a onclick="appendToList('<?php echo $templatedir; ?>','<?php echo $menu_item->append; ?>','<?php echo $menu_item->title; ?>','<?php echo $menu_item->link; ?>','<?php echo $menu_item->ID; ?>','<?php echo $menu_item->parent_item ?>','<?php echo $menu_item->description; ?>')" name="<?php echo $menu_item->title; ?>" value="<?php echo $menu_item->link; ?>"><img alt="<?php esc_attr_e('Add to Custom Menu'); ?>" title="<?php esc_attr_e('Add to Custom Menu'); ?>" src="<?php echo admin_url('images/ico-add.png'); ?>" /></a> </dt>
+ </dl>
+<?php
+ break;
+ }
+}
+
+?>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/wp-includes/nav-menu-template.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesnavmenuphp"></a>
<div class="addfile"><h4>Added: trunk/wp-includes/nav-menu.php (0 => 13366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php (rev 0)
+++ trunk/wp-includes/nav-menu.php 2010-02-24 08:06:36 UTC (rev 13366)
</span><span class="lines">@@ -0,0 +1,178 @@
</span><ins>+<?php
+/**
+ * Navigation Menu functions
+ *
+ * @package WordPress
+ * @subpackage Navigation Menus
+ * @since 3.0.0
+ */
+
+function wp_delete_nav_menu( $menu_id ) {
+ $menu_id = (int) $menu_id;
+ if ( !$menu_id )
+ return false;
+
+ $menu_objects = get_objects_in_term( $menu_id, 'nav_menu' );
+ if ( !empty( $menu_objects ) ) {
+ foreach ( $menu_objects as $item ) {
+ wp_delete_post( $item );
+ }
+ }
+ wp_delete_term( $menu_id, 'nav_menu' );
+}
+
+function wp_create_nav_menu( $menu_name ) {
+ $menu_exists = get_term_by( 'name', $menu_name, 'nav_menu' );
+
+ if ( $menu_exists )
+ return WP_Error('menu_exists', sprintf( __('A menu named "%s" already exists; please try another name.'), $menu_exists->name ));
+
+ $menu = wp_insert_term( $menu_name, 'nav_menu' );
+ if ( is_wp_error($menu) )
+ return $menu;
+
+ return get_term( $menu['term_id'], 'nav_menu');
+}
+
+function wp_get_nav_menu( $menu ) {
+ return get_term( (int) $menu, 'nav_menu');
+}
+
+function wp_get_nav_menus() {
+ return get_terms( 'nav_menu', array( 'hide_empty' => false ) );
+}
+
+function wp_get_nav_menu_items( $menu, $args = array() ) {
+ $items = get_objects_in_term( (int) $menu, 'nav_menu' );
+
+ if ( ! empty( $items ) ) {
+ $defaults = array( 'orderby' => 'menu_order', 'post_type' => 'nav_menu_item', 'post_status' => 'publish', 'output' => ARRAY_A, 'output_key' => 'menu_order' );
+ $args = wp_parse_args($args, $defaults);
+ if ( count( $items ) > 1 )
+ $args['include'] = implode( ',', $items );
+ else
+ $args['include'] = $items[0];
+
+ $items = get_posts( $args );
+
+ if ( ARRAY_A == $args['output'] ) {
+ $output = array();
+ foreach ( $items as $item ) {
+ $output[$item->$args['output_key']] = $item;
+ }
+ unset($items);
+ ksort($output);
+ return $output;
+ }
+ }
+ return $items;
+}
+
+function wp_setup_nav_menu_item($menu_item, $type = 'item', $position = 0) {
+ global $parent_menu_order;
+
+ if ( 'item' == $type ) {
+ $menu_item->type = get_post_meta($menu_item->ID, 'menu_type', true);
+ $menu_item->object_id = get_post_meta($menu_item->ID, 'object_id', true);
+ if ( isset( $parent_menu_order[ $menu_item->post_parent ] ) )
+ $menu_item->parent_item = $parent_menu_order[ $menu_item->post_parent ];
+ else
+ $menu_item->parent_item = 0;
+ } elseif ( 'category' == $type ) {
+ $menu_item->type = $type;
+ $menu_item->object_id = $menu_item->term_id;
+ $menu_item->ID = $menu_item->term_id;
+ $menu_item->parent_item = $menu_item->parent;
+ $menu_item->menu_order = $position;
+ } elseif ( 'page' == $type ) {
+ $menu_item->type = $type;
+ $menu_item->object_id = $menu_item->ID;
+ $menu_item->parent_item = $menu_item->post_parent;
+ $menu_item->menu_order = $position;
+ }
+
+ switch ( $menu_item->type ) {
+ // Page Menu Item
+ case 'page':
+ if ( $menu_item->guid == '' )
+ $menu_item->link = get_permalink( $menu_item->object_id );
+ else
+ $menu_item->link = $menu_item->guid;
+
+ if ( $menu_item->post_title == '' )
+ $menu_item->title = htmlentities( get_the_title( $menu_item->object_id ) );
+ else
+ $menu_item->title = htmlentities( $menu_item->post_title );
+
+ if ( $menu_item->post_content == '' )
+ $menu_item->description = htmlentities( get_post_meta( $menu_item->ID, 'page-description', true ) );
+ else
+ $menu_item->description = htmlentities( $menu_item->post_content );
+ $menu_item->target = '';
+ $menu_item->append = 'Page';
+ break;
+ // Category Menu Item
+ case 'category':
+ if ( empty($menu_item->guid) )
+ $menu_item->link = get_category_link( $menu_item->object_id );
+ else
+ $menu_item->link = $menu_item->guid;
+
+ if ( empty($menu_item->post_title) ) {
+ $title_raw = get_category( $menu_item->object_id );
+ $menu_item->title = htmlentities($title_raw->cat_name);
+ } else {
+ $menu_item->title = htmlentities( $menu_item->post_title );
+ }
+
+ if ( empty($menu_item->post_content) )
+ $menu_item->description = htmlentities( strip_tags( category_description( $menu_item->object_id ) ) );
+ else
+ $menu_item->description = htmlentities( $menu_item->post_content );
+ $menu_item->target = '';
+ $menu_item->append = 'Category';
+ break;
+ default:
+ // Custom Menu Item
+ $menu_item->link = $menu_item->guid;
+ $menu_item->title = htmlentities( $menu_item->post_title );
+ $menu_item->description = htmlentities( $menu_item->post_content );
+ $menu_item->target = 'target="_blank"';
+ $menu_item->append = 'Custom';
+ break;
+ }
+
+ $menu_item->li_class = '';
+ global $wp_query;
+ if ( $menu_item->ID == $wp_query->get_queried_object_id() )
+ $menu_item->li_class = 'class="current_page_item"';
+
+ $menu_item->anchor_title = '';
+/* @todo: update to use tax/post data
+
+ //SET anchor title
+ if (isset($wp_custom_nav_menu_items->custom_anchor_title)) {
+ $anchor_title = htmlentities($wp_custom_nav_menu_items->custom_anchor_title);
+ }
+ else {
+ $anchor_title = $title;
+ }
+
+ if ($queried_id == $wp_custom_nav_menu_items->post_id) {
+ $li_class = 'class="current_page_item"';
+ }
+
+ if (isset($wp_custom_nav_menu_items->new_window)) {
+ if ($wp_custom_nav_menu_items->new_window > 0) {
+ $target = 'target="_blank"';
+ }
+ else {
+ $target = '';
+ }
+ }
+*/
+
+ return $menu_item;
+}
+
+?>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/wp-includes/nav-menu.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (13365 => 13366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2010-02-24 07:58:14 UTC (rev 13365)
+++ trunk/wp-settings.php 2010-02-24 08:06:36 UTC (rev 13366)
</span><span class="lines">@@ -128,6 +128,8 @@
</span><span class="cx"> require( ABSPATH . WPINC . '/media.php' );
</span><span class="cx"> require( ABSPATH . WPINC . '/http.php' );
</span><span class="cx"> require( ABSPATH . WPINC . '/widgets.php' );
</span><ins>+require( ABSPATH . WPINC . '/nav-menu.php' );
+require( ABSPATH . WPINC . '/nav-menu-template.php' );
</ins><span class="cx">
</span><span class="cx"> // Load multisite-specific files.
</span><span class="cx"> if ( is_multisite() ) {
</span></span></pre>
</div>
</div>
</body>
</html>