Changeset 16104

Timestamp:

10/30/2010 06:21:23 PM (13 years ago)

Author:

nacin

Message:

Move code out of the conditional. props duck_, fixes #14415.

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (2 diffs)
• wp-includes/post.php (modified) (3 diffs)

trunk/wp-admin/admin-ajax.php

@@ -744 +744 @@
     require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
 
-    /**
-     * 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.
-     */
+    // 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.
+
     $menu_items_data = (array) $_POST['menu-item'];
     $menu_item_data = array_shift( $menu_items_data ); 
@@ -768 +767 @@
         $_menu_item = array_shift( $_menu_items );
 
-        /** Restore the missing menu item properties **/
+        // Restore the missing menu item properties
         $menu_item_data['menu-item-description'] = $_menu_item->description;
-
-        $menu_items_data = array( $menu_item_data );
-    }
+    }
+
+    $menu_items_data = array( $menu_item_data );
 
     $item_ids = wp_save_nav_menu_items( 0, $menu_items_data );

trunk/wp-includes/post.php

@@ -3098 +3098 @@
 function get_page_by_path($page_path, $output = OBJECT, $post_type = 'page') {
     global $wpdb;
+    $null = null;
     $page_path = rawurlencode(urldecode($page_path));
     $page_path = str_replace('%2F', '/', $page_path);
@@ -3111 +3112 @@
 
     if ( empty($pages) )
-        return null;
+        return $null;
 
     foreach ( $pages as $page ) {
@@ -3125 +3126 @@
     }
 
-    return null;
+    return $null;
 }