WordPress.org

Make WordPress Core

Changeset 16104


Ignore:
Timestamp:
10/30/10 18:21:23 (7 years ago)
Author:
nacin
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/admin-ajax.php

    r16096 r16104  
    744744    require_once ABSPATH . 'wp-admin/includes/nav-menu.php'; 
    745745 
    746     /** 
    747      * For performance reasons, we omit some object properties from the checklist.   
    748      * The following is a hacky way to restore them when adding non-custom items. 
    749      */ 
     746    // For performance reasons, we omit some object properties from the checklist.   
     747    // The following is a hacky way to restore them when adding non-custom items. 
     748 
    750749    $menu_items_data = (array) $_POST['menu-item']; 
    751750    $menu_item_data = array_shift( $menu_items_data );  
     
    768767        $_menu_item = array_shift( $_menu_items ); 
    769768 
    770         /** Restore the missing menu item properties **/ 
     769        // Restore the missing menu item properties 
    771770        $menu_item_data['menu-item-description'] = $_menu_item->description; 
    772  
    773         $menu_items_data = array( $menu_item_data ); 
    774     } 
     771    } 
     772 
     773    $menu_items_data = array( $menu_item_data ); 
    775774 
    776775    $item_ids = wp_save_nav_menu_items( 0, $menu_items_data ); 
  • trunk/wp-includes/post.php

    r16066 r16104  
    30983098function get_page_by_path($page_path, $output = OBJECT, $post_type = 'page') { 
    30993099    global $wpdb; 
     3100    $null = null; 
    31003101    $page_path = rawurlencode(urldecode($page_path)); 
    31013102    $page_path = str_replace('%2F', '/', $page_path); 
     
    31113112 
    31123113    if ( empty($pages) ) 
    3113         return null; 
     3114        return $null; 
    31143115 
    31153116    foreach ( $pages as $page ) { 
     
    31253126    } 
    31263127 
    3127     return null; 
     3128    return $null; 
    31283129} 
    31293130 
Note: See TracChangeset for help on using the changeset viewer.