<!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>[13544] trunk/wp-admin/nav-menus.php: Clean up whitespace in nav-menu.
php see #11817</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13544">13544</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-03-02 03:59:28 +0000 (Tue, 02 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up whitespace in nav-menu.php see <a href="http://trac.wordpress.org/ticket/11817">#11817</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (13543 => 13544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2010-03-02 03:58:02 UTC (rev 13543)
+++ trunk/wp-admin/nav-menus.php 2010-03-02 03:59:28 UTC (rev 13544)
</span><span class="lines">@@ -57,10 +57,10 @@
</span><span class="cx"> if ( isset($_GET['delete-menu']) && $_GET['delete-menu'] > 0 ) {
</span><span class="cx"> // if ( ! current_user_can('delete_menus') )
</span><span class="cx"> // wp_die( __( 'Cheatin&#8217; uh?' ));
</span><del>-
</del><ins>+
</ins><span class="cx"> $menu_id = (int) $_GET['delete-menu'];
</span><span class="cx"> check_admin_referer( 'delete_menu-' . $menu_id );
</span><del>-
</del><ins>+
</ins><span class="cx"> wp_delete_nav_menu( $menu_id );
</span><span class="cx"> $messages_div = '<div id="message" class="updated fade below-h2"><p>' . __('Menu successfully deleted.') . '</p></div>';
</span><span class="cx"> $menu_selected_id = 0;
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> if ( ! $menu_selected_id && ! empty($menus) )
</span><span class="cx"> $menu_selected_id = $menus[0]->term_id;
</span><span class="cx">
</span><del>-// Get the name of the current Menu
</del><ins>+// Get the name of the current Menu
</ins><span class="cx"> $menu_title = '';
</span><span class="cx"> $valid_menu = false;
</span><span class="cx"> if ( $menu_selected_id > 0 ) {
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> if ( $post_counter > 0 && $menu_selected_id > 0 && ! $updated ) {
</span><span class="cx"> $menu_items = wp_get_nav_menu_items( $menu_selected_id, array('orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID') );
</span><span class="cx"> $parent_menu_ids = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Loop through all POST variables
</span><span class="cx"> for ( $k = 1; $k <= $post_counter; $k++ ) {
</span><span class="cx"> $db_id = isset( $_POST['item-dbid'.$k] )? $_POST['item-dbid'.$k] : 0;
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> $custom_title = isset( $_POST['item-title'.$k] )? $_POST['item-title'.$k] : '';
</span><span class="cx"> $custom_linkurl = ( isset( $_POST['item-url'.$k] ) && 'custom' == $_POST['linktype'.$k] ) ? $_POST['item-url'.$k] : '';
</span><span class="cx"> $custom_description = isset( $_POST['item-description'.$k] )? $_POST['item-description'.$k] : '';
</span><del>-
</del><ins>+
</ins><span class="cx"> // doesn't seem to be used by UI
</span><span class="cx"> $position = isset( $_POST['item-position'.$k] )? $_POST['item-position'.$k] : 0;
</span><span class="cx"> $linktype = isset( $_POST['item-type'.$k] )? $_POST['item-type'.$k] : 'custom';
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx">
</span><span class="cx"> if ( $parent_id > 0 && isset( $parent_menu_ids[$parent_id] ) )
</span><span class="cx"> $post['post_parent'] = $parent_menu_ids[$parent_id];
</span><del>-
</del><ins>+
</ins><span class="cx"> // New menu item
</span><span class="cx"> if ( $db_id == 0 ) {
</span><span class="cx"> $db_id = wp_insert_post( $post );
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> <h2><?php esc_html_e('Menus'); ?></h2>
</span><span class="cx"> <?php echo $messages_div; ?>
</span><span class="cx"> <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>
</span><del>-
</del><ins>+
</ins><span class="cx"> <form onsubmit="wp_update_post_data();" action="<?php echo admin_url( 'nav-menus.php' ); ?>" method="post" enctype="multipart/form-data">
</span><span class="cx"> <?php if ( !empty($menus) && count($menus) > 1 ) : ?>
</span><span class="cx"> <ul class="subsubsub">
</span><span class="lines">@@ -195,13 +195,13 @@
</span><span class="cx"> ?>
</span><span class="cx"> </ul>
</span><span class="cx"> <?php endif; ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="menu-management" class="metabox-holder has-right-sidebar">
</span><span class="cx"> <div id="post-body">
</span><span class="cx"> <div id="post-body-content">
</span><span class="cx"> <div id="normal-sortables" class="meta-box-sortables ui-sortable">
</span><span class="cx"> <?php if ( $valid_menu and ! empty( $menus ) ) : ?>
</span><del>- <div id="menu-container" class="postbox">
</del><ins>+ <div id="menu-container" class="postbox">
</ins><span class="cx"> <h3 class="hndle"><?php echo esc_html( $menu_title ); ?></h3>
</span><span class="cx"> <div class="inside">
</span><span class="cx"> <input type="hidden" name="li-count" id="li-count" value="0" />
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> if ( $menu_selected_id > 0 )
</span><span class="cx"> echo wp_get_nav_menu( array( 'type' => 'backend', 'menu' => $menu_selected_id, 'ul_class' => 'menu' ) );
</span><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="queue" class="hide">
</span><span class="cx"> </div><!--/#queue-->
</span><span class="cx"> </div><!-- /.inside -->
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> </div><!--- /#post-body -->
</span><span class="cx"> <div id="menu-settings-column" class="inner-sidebar">
</span><span class="cx"> <div id="side-sortables" class="meta-box-sortables ui-sortable">
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="create-menu" class="postbox">
</span><span class="cx"> <h3 class="hndle"><?php esc_html_e('Create Menu'); ?></h3>
</span><span class="cx"> <div class="inside">
</span><span class="lines">@@ -240,10 +240,10 @@
</span><span class="cx"> </p>
</span><span class="cx"> </div><!-- /.inside-->
</span><span class="cx"> </div><!--END #create-menu-->
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="add-custom-link" class="postbox">
</span><span class="cx"> <h3 class="hndle"><?php esc_html_e('Add a Custom Link'); ?></h3>
</span><del>- <div class="inside">
</del><ins>+ <div class="inside">
</ins><span class="cx"> <p id="menu-item-url-wrap">
</span><span class="cx"> <label class="howto" for="menu-item-url">
</span><span class="cx"> <span><?php _e('URL'); ?></span>
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> <input id="menu-item-name" type="text" class="regular-text" value="<?php echo esc_attr( __('Menu Item') ); ?>" />
</span><span class="cx"> </label>
</span><span class="cx"> </p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <p class="button-controls">
</span><span class="cx"> <a class="show-all"><?php _e('View All'); ?></a>
</span><span class="cx"> <a class="hide-all"><?php _e('Hide All'); ?></a>
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> <br class="clear" />
</span><span class="cx"> </div><!-- /.inside-->
</span><span class="cx"> </div><!-- /#add-custom-link-->
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="add-pages" class="postbox">
</span><span class="cx"> <h3 class="hndle"><?php esc_html_e('Add an Existing Page'); ?></h3>
</span><span class="cx"> <div class="inside">
</span><span class="lines">@@ -299,8 +299,8 @@
</span><span class="cx"> jQuery(document).ready(function(){
</span><span class="cx"> var posts = "<?php echo esc_js( $page_name ); ?>".split('|');
</span><span class="cx"> jQuery('#add-pages .quick-search').autocomplete(posts);
</span><del>-
-
</del><ins>+
+
</ins><span class="cx"> jQuery('#add-pages .quick-search').result(function(event, data, formatted) {
</span><span class="cx"> jQuery('#add-pages .list-wrap').css('display','block');
</span><span class="cx"> jQuery("#add-pages .list-wrap li:contains('" + data + "')").css('display','block');
</span><span class="lines">@@ -313,12 +313,12 @@
</span><span class="cx"> <input type="text" class="quick-search regular-text" value="" />
</span><span class="cx"> <a class="quick-search-submit button"><?php _e('Search'); ?></a>
</span><span class="cx"> </p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <p class="button-controls">
</span><span class="cx"> <a class="show-all"><?php _e('View All'); ?></a>
</span><span class="cx"> <a class="hide-all"><?php _e('Hide All'); ?></a>
</span><span class="cx"> </p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="existing-pages" class="list-wrap">
</span><span class="cx"> <div class="list-container">
</span><span class="cx"> <ul class="list">
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx"> <br class="clear" />
</span><span class="cx"> </div><!-- /.inside-->
</span><span class="cx"> </div><!--END #add-pages-->
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="add-categories" class="postbox">
</span><span class="cx"> <h3 class="hndle"><?php esc_html_e('Add an Existing Category'); ?></h3>
</span><span class="cx"> <div class="inside">
</span><span class="lines">@@ -375,12 +375,12 @@
</span><span class="cx"> <input type="text" class="quick-search regular-text" value="" />
</span><span class="cx"> <a class="quick-search-submit button"><?php _e('Search'); ?></a>
</span><span class="cx"> </p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <p class="button-controls">
</span><span class="cx"> <a class="show-all"><?php _e('View All'); ?></a>
</span><span class="cx"> <a class="hide-all"><?php _e('Hide All'); ?></a>
</span><span class="cx"> </p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="existing-categories" class="list-wrap">
</span><span class="cx"> <div class="list-container">
</span><span class="cx"> <ul class="list">
</span></span></pre>
</div>
</div>
</body>
</html>