<!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" />
<title>[34168] trunk/src/wp-admin/includes: Move the admin Nav Menu Walker subclasses into their own files.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/34168">34168</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/34168","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-09-15 04:01:30 +0000 (Tue, 15 Sep 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Move the admin Nav Menu Walker subclasses into their own files. Load in `nav-menu.php` to remain BC.
See <a href="https://core.trac.wordpress.org/ticket/33413">#33413</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesnavmenuphp">trunk/src/wp-admin/includes/nav-menu.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswalkernavmenuchecklistphp">trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswalkernavmenueditphp">trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswalkernavmenuchecklistphpfromrev34167trunksrcwpadminincludesnavmenuphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php (from rev 34167, trunk/src/wp-admin/includes/nav-menu.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php (rev 0)
+++ trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php 2015-09-15 04:01:30 UTC (rev 34168)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,117 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Navigation Menu API: Walker_Nav_Menu_Checklist class
+ *
+ * @package WordPress
+ * @subpackage Nav_Menus
+ * @since 4.4.0
+ */
+
+/**
+ * Create HTML list of nav menu input items.
+ *
+ * @since 3.0.0
+ * @uses Walker_Nav_Menu
+ */
+class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu {
+ /**
+ *
+ * @param array $fields
+ */
+ public function __construct( $fields = false ) {
+ if ( $fields ) {
+ $this->db_fields = $fields;
+ }
+ }
+
+ /**
+ * Starts the list before the elements are added.
+ *
+ * @see Walker_Nav_Menu::start_lvl()
+ *
+ * @since 3.0.0
+ *
+ * @param string $output Passed by reference. Used to append additional content.
+ * @param int $depth Depth of page. Used for padding.
+ * @param array $args Not used.
+ */
+ public function start_lvl( &$output, $depth = 0, $args = array() ) {
+ $indent = str_repeat( "\t", $depth );
+ $output .= "\n$indent<ul class='children'>\n";
+ }
+
+ /**
+ * Ends the list of after the elements are added.
+ *
+ * @see Walker_Nav_Menu::end_lvl()
+ *
+ * @since 3.0.0
+ *
+ * @param string $output Passed by reference. Used to append additional content.
+ * @param int $depth Depth of page. Used for padding.
+ * @param array $args Not used.
+ */
+ public function end_lvl( &$output, $depth = 0, $args = array() ) {
+ $indent = str_repeat( "\t", $depth );
+ $output .= "\n$indent</ul>";
+ }
+
+ /**
+ * Start the element output.
+ *
+ * @see Walker_Nav_Menu::start_el()
+ *
+ * @since 3.0.0
+ *
+ * @global int $_nav_menu_placeholder
+ *
+ * @param string $output Passed by reference. Used to append additional content.
+ * @param object $item Menu item data object.
+ * @param int $depth Depth of menu item. Used for padding.
+ * @param array $args Not used.
+ * @param int $id Not used.
+ */
+ public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
+ global $_nav_menu_placeholder;
+
+ $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
+ $possible_object_id = isset( $item->post_type ) && 'nav_menu_item' == $item->post_type ? $item->object_id : $_nav_menu_placeholder;
+ $possible_db_id = ( ! empty( $item->ID ) ) && ( 0 < $possible_object_id ) ? (int) $item->ID : 0;
+
+ $indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
+
+ $output .= $indent . '<li>';
+ $output .= '<label class="menu-item-title">';
+ $output .= '<input type="checkbox" class="menu-item-checkbox';
+
+ if ( ! empty( $item->front_or_home ) )
+ $output .= ' add-to-top';
+
+ $output .= '" name="menu-item[' . $possible_object_id . '][menu-item-object-id]" value="'. esc_attr( $item->object_id ) .'" /> ';
+
+ if ( ! empty( $item->label ) ) {
+ $title = $item->label;
+ } elseif ( isset( $item->post_type ) ) {
+ /** This filter is documented in wp-includes/post-template.php */
+ $title = apply_filters( 'the_title', $item->post_title, $item->ID );
+ if ( ! empty( $item->front_or_home ) && _x( 'Home', 'nav menu home label' ) !== $title )
+ $title = sprintf( _x( 'Home: %s', 'nav menu front page title' ), $title );
+ }
+
+ $output .= isset( $title ) ? esc_html( $title ) : esc_html( $item->title );
+ $output .= '</label>';
+
+ // Menu item hidden fields
+ $output .= '<input type="hidden" class="menu-item-db-id" name="menu-item[' . $possible_object_id . '][menu-item-db-id]" value="' . $possible_db_id . '" />';
+ $output .= '<input type="hidden" class="menu-item-object" name="menu-item[' . $possible_object_id . '][menu-item-object]" value="'. esc_attr( $item->object ) .'" />';
+ $output .= '<input type="hidden" class="menu-item-parent-id" name="menu-item[' . $possible_object_id . '][menu-item-parent-id]" value="'. esc_attr( $item->menu_item_parent ) .'" />';
+ $output .= '<input type="hidden" class="menu-item-type" name="menu-item[' . $possible_object_id . '][menu-item-type]" value="'. esc_attr( $item->type ) .'" />';
+ $output .= '<input type="hidden" class="menu-item-title" name="menu-item[' . $possible_object_id . '][menu-item-title]" value="'. esc_attr( $item->title ) .'" />';
+ $output .= '<input type="hidden" class="menu-item-url" name="menu-item[' . $possible_object_id . '][menu-item-url]" value="'. esc_attr( $item->url ) .'" />';
+ $output .= '<input type="hidden" class="menu-item-target" name="menu-item[' . $possible_object_id . '][menu-item-target]" value="'. esc_attr( $item->target ) .'" />';
+ $output .= '<input type="hidden" class="menu-item-attr_title" name="menu-item[' . $possible_object_id . '][menu-item-attr_title]" value="'. esc_attr( $item->attr_title ) .'" />';
+ $output .= '<input type="hidden" class="menu-item-classes" name="menu-item[' . $possible_object_id . '][menu-item-classes]" value="'. esc_attr( implode( ' ', $item->classes ) ) .'" />';
+ $output .= '<input type="hidden" class="menu-item-xfn" name="menu-item[' . $possible_object_id . '][menu-item-xfn]" value="'. esc_attr( $item->xfn ) .'" />';
+ }
+
+} // Walker_Nav_Menu_Checklist
</ins></span></pre></div>
<a id="trunksrcwpadminincludesclasswalkernavmenueditphpfromrev34167trunksrcwpadminincludesnavmenuphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php (from rev 34167, trunk/src/wp-admin/includes/nav-menu.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php (rev 0)
+++ trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php 2015-09-15 04:01:30 UTC (rev 34168)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,238 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Navigation Menu API: Walker_Nav_Menu_Edit class
+ *
+ * @package WordPress
+ * @subpackage Nav_Menus
+ * @since 4.4.0
+ */
+
+/**
+ * Create HTML list of nav menu input items.
+ *
+ * @package WordPress
+ * @since 3.0.0
+ * @uses Walker_Nav_Menu
+ */
+class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
+ /**
+ * Starts the list before the elements are added.
+ *
+ * @see Walker_Nav_Menu::start_lvl()
+ *
+ * @since 3.0.0
+ *
+ * @param string $output Passed by reference.
+ * @param int $depth Depth of menu item. Used for padding.
+ * @param array $args Not used.
+ */
+ public function start_lvl( &$output, $depth = 0, $args = array() ) {}
+
+ /**
+ * Ends the list of after the elements are added.
+ *
+ * @see Walker_Nav_Menu::end_lvl()
+ *
+ * @since 3.0.0
+ *
+ * @param string $output Passed by reference.
+ * @param int $depth Depth of menu item. Used for padding.
+ * @param array $args Not used.
+ */
+ public function end_lvl( &$output, $depth = 0, $args = array() ) {}
+
+ /**
+ * Start the element output.
+ *
+ * @see Walker_Nav_Menu::start_el()
+ * @since 3.0.0
+ *
+ * @global int $_wp_nav_menu_max_depth
+ *
+ * @param string $output Passed by reference. Used to append additional content.
+ * @param object $item Menu item data object.
+ * @param int $depth Depth of menu item. Used for padding.
+ * @param array $args Not used.
+ * @param int $id Not used.
+ */
+ public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
+ global $_wp_nav_menu_max_depth;
+ $_wp_nav_menu_max_depth = $depth > $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_depth;
+
+ ob_start();
+ $item_id = esc_attr( $item->ID );
+ $removed_args = array(
+ 'action',
+ 'customlink-tab',
+ 'edit-menu-item',
+ 'menu-item',
+ 'page-tab',
+ '_wpnonce',
+ );
+
+ $original_title = '';
+ if ( 'taxonomy' == $item->type ) {
+ $original_title = get_term_field( 'name', $item->object_id, $item->object, 'raw' );
+ if ( is_wp_error( $original_title ) )
+ $original_title = false;
+ } elseif ( 'post_type' == $item->type ) {
+ $original_object = get_post( $item->object_id );
+ $original_title = get_the_title( $original_object->ID );
+ }
+
+ $classes = array(
+ 'menu-item menu-item-depth-' . $depth,
+ 'menu-item-' . esc_attr( $item->object ),
+ 'menu-item-edit-' . ( ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? 'active' : 'inactive'),
+ );
+
+ $title = $item->title;
+
+ if ( ! empty( $item->_invalid ) ) {
+ $classes[] = 'menu-item-invalid';
+ /* translators: %s: title of menu item which is invalid */
+ $title = sprintf( __( '%s (Invalid)' ), $item->title );
+ } elseif ( isset( $item->post_status ) && 'draft' == $item->post_status ) {
+ $classes[] = 'pending';
+ /* translators: %s: title of menu item in draft status */
+ $title = sprintf( __('%s (Pending)'), $item->title );
+ }
+
+ $title = ( ! isset( $item->label ) || '' == $item->label ) ? $title : $item->label;
+
+ $submenu_text = '';
+ if ( 0 == $depth )
+ $submenu_text = 'style="display: none;"';
+
+ ?>
+ <li id="menu-item-<?php echo $item_id; ?>" class="<?php echo implode(' ', $classes ); ?>">
+ <div class="menu-item-bar">
+ <div class="menu-item-handle">
+ <span class="item-title"><span class="menu-item-title"><?php echo esc_html( $title ); ?></span> <span class="is-submenu" <?php echo $submenu_text; ?>><?php _e( 'sub item' ); ?></span></span>
+ <span class="item-controls">
+ <span class="item-type"><?php echo esc_html( $item->type_label ); ?></span>
+ <span class="item-order hide-if-js">
+ <a href="<?php
+ echo wp_nonce_url(
+ add_query_arg(
+ array(
+ 'action' => 'move-up-menu-item',
+ 'menu-item' => $item_id,
+ ),
+ remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
+ ),
+ 'move-menu_item'
+ );
+ ?>" class="item-move-up"><abbr title="<?php esc_attr_e('Move up'); ?>">↑</abbr></a>
+ |
+ <a href="<?php
+ echo wp_nonce_url(
+ add_query_arg(
+ array(
+ 'action' => 'move-down-menu-item',
+ 'menu-item' => $item_id,
+ ),
+ remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
+ ),
+ 'move-menu_item'
+ );
+ ?>" class="item-move-down"><abbr title="<?php esc_attr_e('Move down'); ?>">↓</abbr></a>
+ </span>
+ <a class="item-edit" id="edit-<?php echo $item_id; ?>" title="<?php esc_attr_e('Edit Menu Item'); ?>" href="<?php
+ echo ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? admin_url( 'nav-menus.php' ) : add_query_arg( 'edit-menu-item', $item_id, remove_query_arg( $removed_args, admin_url( 'nav-menus.php#menu-item-settings-' . $item_id ) ) );
+ ?>"><?php _e( 'Edit Menu Item' ); ?></a>
+ </span>
+ </div>
+ </div>
+
+ <div class="menu-item-settings" id="menu-item-settings-<?php echo $item_id; ?>">
+ <?php if ( 'custom' == $item->type ) : ?>
+ <p class="field-url description description-wide">
+ <label for="edit-menu-item-url-<?php echo $item_id; ?>">
+ <?php _e( 'URL' ); ?><br />
+ <input type="text" id="edit-menu-item-url-<?php echo $item_id; ?>" class="widefat code edit-menu-item-url" name="menu-item-url[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->url ); ?>" />
+ </label>
+ </p>
+ <?php endif; ?>
+ <p class="description description-wide">
+ <label for="edit-menu-item-title-<?php echo $item_id; ?>">
+ <?php _e( 'Navigation Label' ); ?><br />
+ <input type="text" id="edit-menu-item-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-title" name="menu-item-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->title ); ?>" />
+ </label>
+ </p>
+ <p class="field-title-attribute description description-wide">
+ <label for="edit-menu-item-attr-title-<?php echo $item_id; ?>">
+ <?php _e( 'Title Attribute' ); ?><br />
+ <input type="text" id="edit-menu-item-attr-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->post_excerpt ); ?>" />
+ </label>
+ </p>
+ <p class="field-link-target description">
+ <label for="edit-menu-item-target-<?php echo $item_id; ?>">
+ <input type="checkbox" id="edit-menu-item-target-<?php echo $item_id; ?>" value="_blank" name="menu-item-target[<?php echo $item_id; ?>]"<?php checked( $item->target, '_blank' ); ?> />
+ <?php _e( 'Open link in a new tab' ); ?>
+ </label>
+ </p>
+ <p class="field-css-classes description description-thin">
+ <label for="edit-menu-item-classes-<?php echo $item_id; ?>">
+ <?php _e( 'CSS Classes (optional)' ); ?><br />
+ <input type="text" id="edit-menu-item-classes-<?php echo $item_id; ?>" class="widefat code edit-menu-item-classes" name="menu-item-classes[<?php echo $item_id; ?>]" value="<?php echo esc_attr( implode(' ', $item->classes ) ); ?>" />
+ </label>
+ </p>
+ <p class="field-xfn description description-thin">
+ <label for="edit-menu-item-xfn-<?php echo $item_id; ?>">
+ <?php _e( 'Link Relationship (XFN)' ); ?><br />
+ <input type="text" id="edit-menu-item-xfn-<?php echo $item_id; ?>" class="widefat code edit-menu-item-xfn" name="menu-item-xfn[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->xfn ); ?>" />
+ </label>
+ </p>
+ <p class="field-description description description-wide">
+ <label for="edit-menu-item-description-<?php echo $item_id; ?>">
+ <?php _e( 'Description' ); ?><br />
+ <textarea id="edit-menu-item-description-<?php echo $item_id; ?>" class="widefat edit-menu-item-description" rows="3" cols="20" name="menu-item-description[<?php echo $item_id; ?>]"><?php echo esc_html( $item->description ); // textarea_escaped ?></textarea>
+ <span class="description"><?php _e('The description will be displayed in the menu if the current theme supports it.'); ?></span>
+ </label>
+ </p>
+
+ <p class="field-move hide-if-no-js description description-wide">
+ <label>
+ <span><?php _e( 'Move' ); ?></span>
+ <a href="#" class="menus-move menus-move-up" data-dir="up"><?php _e( 'Up one' ); ?></a>
+ <a href="#" class="menus-move menus-move-down" data-dir="down"><?php _e( 'Down one' ); ?></a>
+ <a href="#" class="menus-move menus-move-left" data-dir="left"></a>
+ <a href="#" class="menus-move menus-move-right" data-dir="right"></a>
+ <a href="#" class="menus-move menus-move-top" data-dir="top"><?php _e( 'To the top' ); ?></a>
+ </label>
+ </p>
+
+ <div class="menu-item-actions description-wide submitbox">
+ <?php if ( 'custom' != $item->type && $original_title !== false ) : ?>
+ <p class="link-to-original">
+ <?php printf( __('Original: %s'), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>' ); ?>
+ </p>
+ <?php endif; ?>
+ <a class="item-delete submitdelete deletion" id="delete-<?php echo $item_id; ?>" href="<?php
+ echo wp_nonce_url(
+ add_query_arg(
+ array(
+ 'action' => 'delete-menu-item',
+ 'menu-item' => $item_id,
+ ),
+ admin_url( 'nav-menus.php' )
+ ),
+ 'delete-menu_item_' . $item_id
+ ); ?>"><?php _e( 'Remove' ); ?></a> <span class="meta-sep hide-if-no-js"> | </span> <a class="item-cancel submitcancel hide-if-no-js" id="cancel-<?php echo $item_id; ?>" href="<?php echo esc_url( add_query_arg( array( 'edit-menu-item' => $item_id, 'cancel' => time() ), admin_url( 'nav-menus.php' ) ) );
+ ?>#menu-item-settings-<?php echo $item_id; ?>"><?php _e('Cancel'); ?></a>
+ </div>
+
+ <input class="menu-item-data-db-id" type="hidden" name="menu-item-db-id[<?php echo $item_id; ?>]" value="<?php echo $item_id; ?>" />
+ <input class="menu-item-data-object-id" type="hidden" name="menu-item-object-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object_id ); ?>" />
+ <input class="menu-item-data-object" type="hidden" name="menu-item-object[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object ); ?>" />
+ <input class="menu-item-data-parent-id" type="hidden" name="menu-item-parent-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_item_parent ); ?>" />
+ <input class="menu-item-data-position" type="hidden" name="menu-item-position[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_order ); ?>" />
+ <input class="menu-item-data-type" type="hidden" name="menu-item-type[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->type ); ?>" />
+ </div><!-- .menu-item-settings-->
+ <ul class="menu-item-transport"></ul>
+ <?php
+ $output .= ob_get_clean();
+ }
+
+} // Walker_Nav_Menu_Edit
</ins></span></pre></div>
<a id="trunksrcwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/nav-menu.php 2015-09-15 03:45:23 UTC (rev 34167)
+++ trunk/src/wp-admin/includes/nav-menu.php 2015-09-15 04:01:30 UTC (rev 34168)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,345 +1,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * Create HTML list of nav menu input items.
- *
- * @package WordPress
- * @since 3.0.0
- * @uses Walker_Nav_Menu
- */
-class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
- /**
- * Starts the list before the elements are added.
- *
- * @see Walker_Nav_Menu::start_lvl()
- *
- * @since 3.0.0
- *
- * @param string $output Passed by reference.
- * @param int $depth Depth of menu item. Used for padding.
- * @param array $args Not used.
- */
- public function start_lvl( &$output, $depth = 0, $args = array() ) {}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** Walker_Nav_Menu_Edit class */
+require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-edit.php' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Ends the list of after the elements are added.
- *
- * @see Walker_Nav_Menu::end_lvl()
- *
- * @since 3.0.0
- *
- * @param string $output Passed by reference.
- * @param int $depth Depth of menu item. Used for padding.
- * @param array $args Not used.
- */
- public function end_lvl( &$output, $depth = 0, $args = array() ) {}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** Walker_Nav_Menu_Checklist class */
+require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-checklist.php' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Start the element output.
- *
- * @see Walker_Nav_Menu::start_el()
- * @since 3.0.0
- *
- * @global int $_wp_nav_menu_max_depth
- *
- * @param string $output Passed by reference. Used to append additional content.
- * @param object $item Menu item data object.
- * @param int $depth Depth of menu item. Used for padding.
- * @param array $args Not used.
- * @param int $id Not used.
- */
- public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
- global $_wp_nav_menu_max_depth;
- $_wp_nav_menu_max_depth = $depth > $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_depth;
-
- ob_start();
- $item_id = esc_attr( $item->ID );
- $removed_args = array(
- 'action',
- 'customlink-tab',
- 'edit-menu-item',
- 'menu-item',
- 'page-tab',
- '_wpnonce',
- );
-
- $original_title = '';
- if ( 'taxonomy' == $item->type ) {
- $original_title = get_term_field( 'name', $item->object_id, $item->object, 'raw' );
- if ( is_wp_error( $original_title ) )
- $original_title = false;
- } elseif ( 'post_type' == $item->type ) {
- $original_object = get_post( $item->object_id );
- $original_title = get_the_title( $original_object->ID );
- }
-
- $classes = array(
- 'menu-item menu-item-depth-' . $depth,
- 'menu-item-' . esc_attr( $item->object ),
- 'menu-item-edit-' . ( ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? 'active' : 'inactive'),
- );
-
- $title = $item->title;
-
- if ( ! empty( $item->_invalid ) ) {
- $classes[] = 'menu-item-invalid';
- /* translators: %s: title of menu item which is invalid */
- $title = sprintf( __( '%s (Invalid)' ), $item->title );
- } elseif ( isset( $item->post_status ) && 'draft' == $item->post_status ) {
- $classes[] = 'pending';
- /* translators: %s: title of menu item in draft status */
- $title = sprintf( __('%s (Pending)'), $item->title );
- }
-
- $title = ( ! isset( $item->label ) || '' == $item->label ) ? $title : $item->label;
-
- $submenu_text = '';
- if ( 0 == $depth )
- $submenu_text = 'style="display: none;"';
-
- ?>
- <li id="menu-item-<?php echo $item_id; ?>" class="<?php echo implode(' ', $classes ); ?>">
- <div class="menu-item-bar">
- <div class="menu-item-handle">
- <span class="item-title"><span class="menu-item-title"><?php echo esc_html( $title ); ?></span> <span class="is-submenu" <?php echo $submenu_text; ?>><?php _e( 'sub item' ); ?></span></span>
- <span class="item-controls">
- <span class="item-type"><?php echo esc_html( $item->type_label ); ?></span>
- <span class="item-order hide-if-js">
- <a href="<?php
- echo wp_nonce_url(
- add_query_arg(
- array(
- 'action' => 'move-up-menu-item',
- 'menu-item' => $item_id,
- ),
- remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
- ),
- 'move-menu_item'
- );
- ?>" class="item-move-up"><abbr title="<?php esc_attr_e('Move up'); ?>">↑</abbr></a>
- |
- <a href="<?php
- echo wp_nonce_url(
- add_query_arg(
- array(
- 'action' => 'move-down-menu-item',
- 'menu-item' => $item_id,
- ),
- remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
- ),
- 'move-menu_item'
- );
- ?>" class="item-move-down"><abbr title="<?php esc_attr_e('Move down'); ?>">↓</abbr></a>
- </span>
- <a class="item-edit" id="edit-<?php echo $item_id; ?>" title="<?php esc_attr_e('Edit Menu Item'); ?>" href="<?php
- echo ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? admin_url( 'nav-menus.php' ) : add_query_arg( 'edit-menu-item', $item_id, remove_query_arg( $removed_args, admin_url( 'nav-menus.php#menu-item-settings-' . $item_id ) ) );
- ?>"><?php _e( 'Edit Menu Item' ); ?></a>
- </span>
- </div>
- </div>
-
- <div class="menu-item-settings" id="menu-item-settings-<?php echo $item_id; ?>">
- <?php if ( 'custom' == $item->type ) : ?>
- <p class="field-url description description-wide">
- <label for="edit-menu-item-url-<?php echo $item_id; ?>">
- <?php _e( 'URL' ); ?><br />
- <input type="text" id="edit-menu-item-url-<?php echo $item_id; ?>" class="widefat code edit-menu-item-url" name="menu-item-url[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->url ); ?>" />
- </label>
- </p>
- <?php endif; ?>
- <p class="description description-wide">
- <label for="edit-menu-item-title-<?php echo $item_id; ?>">
- <?php _e( 'Navigation Label' ); ?><br />
- <input type="text" id="edit-menu-item-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-title" name="menu-item-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->title ); ?>" />
- </label>
- </p>
- <p class="field-title-attribute description description-wide">
- <label for="edit-menu-item-attr-title-<?php echo $item_id; ?>">
- <?php _e( 'Title Attribute' ); ?><br />
- <input type="text" id="edit-menu-item-attr-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->post_excerpt ); ?>" />
- </label>
- </p>
- <p class="field-link-target description">
- <label for="edit-menu-item-target-<?php echo $item_id; ?>">
- <input type="checkbox" id="edit-menu-item-target-<?php echo $item_id; ?>" value="_blank" name="menu-item-target[<?php echo $item_id; ?>]"<?php checked( $item->target, '_blank' ); ?> />
- <?php _e( 'Open link in a new tab' ); ?>
- </label>
- </p>
- <p class="field-css-classes description description-thin">
- <label for="edit-menu-item-classes-<?php echo $item_id; ?>">
- <?php _e( 'CSS Classes (optional)' ); ?><br />
- <input type="text" id="edit-menu-item-classes-<?php echo $item_id; ?>" class="widefat code edit-menu-item-classes" name="menu-item-classes[<?php echo $item_id; ?>]" value="<?php echo esc_attr( implode(' ', $item->classes ) ); ?>" />
- </label>
- </p>
- <p class="field-xfn description description-thin">
- <label for="edit-menu-item-xfn-<?php echo $item_id; ?>">
- <?php _e( 'Link Relationship (XFN)' ); ?><br />
- <input type="text" id="edit-menu-item-xfn-<?php echo $item_id; ?>" class="widefat code edit-menu-item-xfn" name="menu-item-xfn[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->xfn ); ?>" />
- </label>
- </p>
- <p class="field-description description description-wide">
- <label for="edit-menu-item-description-<?php echo $item_id; ?>">
- <?php _e( 'Description' ); ?><br />
- <textarea id="edit-menu-item-description-<?php echo $item_id; ?>" class="widefat edit-menu-item-description" rows="3" cols="20" name="menu-item-description[<?php echo $item_id; ?>]"><?php echo esc_html( $item->description ); // textarea_escaped ?></textarea>
- <span class="description"><?php _e('The description will be displayed in the menu if the current theme supports it.'); ?></span>
- </label>
- </p>
-
- <p class="field-move hide-if-no-js description description-wide">
- <label>
- <span><?php _e( 'Move' ); ?></span>
- <a href="#" class="menus-move menus-move-up" data-dir="up"><?php _e( 'Up one' ); ?></a>
- <a href="#" class="menus-move menus-move-down" data-dir="down"><?php _e( 'Down one' ); ?></a>
- <a href="#" class="menus-move menus-move-left" data-dir="left"></a>
- <a href="#" class="menus-move menus-move-right" data-dir="right"></a>
- <a href="#" class="menus-move menus-move-top" data-dir="top"><?php _e( 'To the top' ); ?></a>
- </label>
- </p>
-
- <div class="menu-item-actions description-wide submitbox">
- <?php if ( 'custom' != $item->type && $original_title !== false ) : ?>
- <p class="link-to-original">
- <?php printf( __('Original: %s'), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>' ); ?>
- </p>
- <?php endif; ?>
- <a class="item-delete submitdelete deletion" id="delete-<?php echo $item_id; ?>" href="<?php
- echo wp_nonce_url(
- add_query_arg(
- array(
- 'action' => 'delete-menu-item',
- 'menu-item' => $item_id,
- ),
- admin_url( 'nav-menus.php' )
- ),
- 'delete-menu_item_' . $item_id
- ); ?>"><?php _e( 'Remove' ); ?></a> <span class="meta-sep hide-if-no-js"> | </span> <a class="item-cancel submitcancel hide-if-no-js" id="cancel-<?php echo $item_id; ?>" href="<?php echo esc_url( add_query_arg( array( 'edit-menu-item' => $item_id, 'cancel' => time() ), admin_url( 'nav-menus.php' ) ) );
- ?>#menu-item-settings-<?php echo $item_id; ?>"><?php _e('Cancel'); ?></a>
- </div>
-
- <input class="menu-item-data-db-id" type="hidden" name="menu-item-db-id[<?php echo $item_id; ?>]" value="<?php echo $item_id; ?>" />
- <input class="menu-item-data-object-id" type="hidden" name="menu-item-object-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object_id ); ?>" />
- <input class="menu-item-data-object" type="hidden" name="menu-item-object[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object ); ?>" />
- <input class="menu-item-data-parent-id" type="hidden" name="menu-item-parent-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_item_parent ); ?>" />
- <input class="menu-item-data-position" type="hidden" name="menu-item-position[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_order ); ?>" />
- <input class="menu-item-data-type" type="hidden" name="menu-item-type[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->type ); ?>" />
- </div><!-- .menu-item-settings-->
- <ul class="menu-item-transport"></ul>
- <?php
- $output .= ob_get_clean();
- }
-
-} // Walker_Nav_Menu_Edit
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Create HTML list of nav menu input items.
- *
- * @since 3.0.0
- * @uses Walker_Nav_Menu
- */
-class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu {
- /**
- *
- * @param array $fields
- */
- public function __construct( $fields = false ) {
- if ( $fields ) {
- $this->db_fields = $fields;
- }
- }
-
- /**
- * Starts the list before the elements are added.
- *
- * @see Walker_Nav_Menu::start_lvl()
- *
- * @since 3.0.0
- *
- * @param string $output Passed by reference. Used to append additional content.
- * @param int $depth Depth of page. Used for padding.
- * @param array $args Not used.
- */
- public function start_lvl( &$output, $depth = 0, $args = array() ) {
- $indent = str_repeat( "\t", $depth );
- $output .= "\n$indent<ul class='children'>\n";
- }
-
- /**
- * Ends the list of after the elements are added.
- *
- * @see Walker_Nav_Menu::end_lvl()
- *
- * @since 3.0.0
- *
- * @param string $output Passed by reference. Used to append additional content.
- * @param int $depth Depth of page. Used for padding.
- * @param array $args Not used.
- */
- public function end_lvl( &$output, $depth = 0, $args = array() ) {
- $indent = str_repeat( "\t", $depth );
- $output .= "\n$indent</ul>";
- }
-
- /**
- * Start the element output.
- *
- * @see Walker_Nav_Menu::start_el()
- *
- * @since 3.0.0
- *
- * @global int $_nav_menu_placeholder
- *
- * @param string $output Passed by reference. Used to append additional content.
- * @param object $item Menu item data object.
- * @param int $depth Depth of menu item. Used for padding.
- * @param array $args Not used.
- * @param int $id Not used.
- */
- public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
- global $_nav_menu_placeholder;
-
- $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
- $possible_object_id = isset( $item->post_type ) && 'nav_menu_item' == $item->post_type ? $item->object_id : $_nav_menu_placeholder;
- $possible_db_id = ( ! empty( $item->ID ) ) && ( 0 < $possible_object_id ) ? (int) $item->ID : 0;
-
- $indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
-
- $output .= $indent . '<li>';
- $output .= '<label class="menu-item-title">';
- $output .= '<input type="checkbox" class="menu-item-checkbox';
-
- if ( ! empty( $item->front_or_home ) )
- $output .= ' add-to-top';
-
- $output .= '" name="menu-item[' . $possible_object_id . '][menu-item-object-id]" value="'. esc_attr( $item->object_id ) .'" /> ';
-
- if ( ! empty( $item->label ) ) {
- $title = $item->label;
- } elseif ( isset( $item->post_type ) ) {
- /** This filter is documented in wp-includes/post-template.php */
- $title = apply_filters( 'the_title', $item->post_title, $item->ID );
- if ( ! empty( $item->front_or_home ) && _x( 'Home', 'nav menu home label' ) !== $title )
- $title = sprintf( _x( 'Home: %s', 'nav menu front page title' ), $title );
- }
-
- $output .= isset( $title ) ? esc_html( $title ) : esc_html( $item->title );
- $output .= '</label>';
-
- // Menu item hidden fields
- $output .= '<input type="hidden" class="menu-item-db-id" name="menu-item[' . $possible_object_id . '][menu-item-db-id]" value="' . $possible_db_id . '" />';
- $output .= '<input type="hidden" class="menu-item-object" name="menu-item[' . $possible_object_id . '][menu-item-object]" value="'. esc_attr( $item->object ) .'" />';
- $output .= '<input type="hidden" class="menu-item-parent-id" name="menu-item[' . $possible_object_id . '][menu-item-parent-id]" value="'. esc_attr( $item->menu_item_parent ) .'" />';
- $output .= '<input type="hidden" class="menu-item-type" name="menu-item[' . $possible_object_id . '][menu-item-type]" value="'. esc_attr( $item->type ) .'" />';
- $output .= '<input type="hidden" class="menu-item-title" name="menu-item[' . $possible_object_id . '][menu-item-title]" value="'. esc_attr( $item->title ) .'" />';
- $output .= '<input type="hidden" class="menu-item-url" name="menu-item[' . $possible_object_id . '][menu-item-url]" value="'. esc_attr( $item->url ) .'" />';
- $output .= '<input type="hidden" class="menu-item-target" name="menu-item[' . $possible_object_id . '][menu-item-target]" value="'. esc_attr( $item->target ) .'" />';
- $output .= '<input type="hidden" class="menu-item-attr_title" name="menu-item[' . $possible_object_id . '][menu-item-attr_title]" value="'. esc_attr( $item->attr_title ) .'" />';
- $output .= '<input type="hidden" class="menu-item-classes" name="menu-item[' . $possible_object_id . '][menu-item-classes]" value="'. esc_attr( implode( ' ', $item->classes ) ) .'" />';
- $output .= '<input type="hidden" class="menu-item-xfn" name="menu-item[' . $possible_object_id . '][menu-item-xfn]" value="'. esc_attr( $item->xfn ) .'" />';
- }
-
-} // Walker_Nav_Menu_Checklist
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Prints the appropriate response to a menu quick search.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span></span></pre>
</div>
</div>
</body>
</html>