<!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>[16104] trunk: Move code out of the conditional.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16104">16104</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-30 18:21:23 +0000 (Sat, 30 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move code out of the conditional. props duck_, fixes <a href="http://trac.wordpress.org/ticket/14415">#14415</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (16103 => 16104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-10-30 14:31:13 UTC (rev 16103)
+++ trunk/wp-admin/admin-ajax.php 2010-10-30 18:21:23 UTC (rev 16104)
</span><span class="lines">@@ -743,10 +743,9 @@
</span><span class="cx">
</span><span class="cx"> require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
</span><span class="cx">
</span><del>- /**
- * For performance reasons, we omit some object properties from the checklist.
- * The following is a hacky way to restore them when adding non-custom items.
- */
</del><ins>+ // For performance reasons, we omit some object properties from the checklist.
+ // The following is a hacky way to restore them when adding non-custom items.
+
</ins><span class="cx"> $menu_items_data = (array) $_POST['menu-item'];
</span><span class="cx"> $menu_item_data = array_shift( $menu_items_data );
</span><span class="cx"> if (
</span><span class="lines">@@ -767,12 +766,12 @@
</span><span class="cx"> $_menu_items = array_map( 'wp_setup_nav_menu_item', array( $_object ) );
</span><span class="cx"> $_menu_item = array_shift( $_menu_items );
</span><span class="cx">
</span><del>- /** Restore the missing menu item properties **/
</del><ins>+ // Restore the missing menu item properties
</ins><span class="cx"> $menu_item_data['menu-item-description'] = $_menu_item->description;
</span><del>-
- $menu_items_data = array( $menu_item_data );
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+ $menu_items_data = array( $menu_item_data );
+
</ins><span class="cx"> $item_ids = wp_save_nav_menu_items( 0, $menu_items_data );
</span><span class="cx"> if ( is_wp_error( $item_ids ) )
</span><span class="cx"> die('-1');
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (16103 => 16104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-10-30 14:31:13 UTC (rev 16103)
+++ trunk/wp-includes/post.php 2010-10-30 18:21:23 UTC (rev 16104)
</span><span class="lines">@@ -3097,6 +3097,7 @@
</span><span class="cx"> */
</span><span class="cx"> function get_page_by_path($page_path, $output = OBJECT, $post_type = 'page') {
</span><span class="cx"> global $wpdb;
</span><ins>+ $null = null;
</ins><span class="cx"> $page_path = rawurlencode(urldecode($page_path));
</span><span class="cx"> $page_path = str_replace('%2F', '/', $page_path);
</span><span class="cx"> $page_path = str_replace('%20', ' ', $page_path);
</span><span class="lines">@@ -3110,7 +3111,7 @@
</span><span class="cx"> $pages = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_name = %s AND (post_type = %s OR post_type = 'attachment')", $leaf_path, $post_type ));
</span><span class="cx">
</span><span class="cx"> if ( empty($pages) )
</span><del>- return null;
</del><ins>+ return $null;
</ins><span class="cx">
</span><span class="cx"> foreach ( $pages as $page ) {
</span><span class="cx"> $path = '/' . $leaf_path;
</span><span class="lines">@@ -3124,7 +3125,7 @@
</span><span class="cx"> return get_page($page->ID, $output, $post_type);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return null;
</del><ins>+ return $null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>