Changeset 3190

Show
Ignore:
Timestamp:
11/22/05 00:36:36 (3 years ago)
Author:
ryan
Message:

Update meta before updating the post so that page_template is not stomped. fixes #1933

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/admin-functions.php

    r3176 r3190  
    176176    } 
    177177 
     178    // Meta Stuff 
     179    if ($_POST['meta']) { 
     180        foreach ($_POST['meta'] as $key => $value) 
     181            update_meta($key, $value['key'], $value['value']); 
     182    } 
     183     
     184    if ($_POST['deletemeta']) { 
     185        foreach ($_POST['deletemeta'] as $key => $value) 
     186            delete_meta($key); 
     187    } 
     188 
     189    add_meta($post_ID); 
     190 
    178191    wp_update_post($_POST); 
    179192 
    180193    // Now that we have an ID we can fix any attachment anchor hrefs 
    181     fix_attachment_links($_POST['ID']); 
    182  
    183     // Meta Stuff 
    184     if ($_POST['meta']) 
    185         : foreach ($_POST['meta'] as $key => $value) 
    186             : update_meta($key, $value['key'], $value['value']); 
    187     endforeach; 
    188     endif; 
    189  
    190     if ($_POST['deletemeta']) 
    191         : foreach ($_POST['deletemeta'] as $key => $value) 
    192             : delete_meta($key); 
    193     endforeach; 
    194     endif; 
    195  
    196     add_meta($post_ID); 
     194    fix_attachment_links($post_ID); 
    197195 
    198196    return $post_ID; 

  • trunk/wp-includes/functions-post.php

    r3169 r3190  
    185185        generate_page_rewrite_rules(); 
    186186 
    187         if ( empty($page_template) ) 
    188             $page_template = 'Default Template'; 
    189  
    190         if ( ! update_post_meta($post_ID, '_wp_page_template',  $page_template)) 
    191             add_post_meta($post_ID, '_wp_page_template',  $page_template, true); 
     187        if ( !empty($page_template) ) 
     188            if ( ! update_post_meta($post_ID, '_wp_page_template',  $page_template)) 
     189                add_post_meta($post_ID, '_wp_page_template',  $page_template, true); 
    192190    } 
    193191 

  • trunk/wp-includes/functions.php

    r3142 r3190  
    511511meta_key = '$key' AND post_id = '$post_id'"); 
    512512        $cache_key = $post_meta_cache['$post_id'][$key]; 
    513         foreach ($cache_key as $index => $data) 
    514             $post_meta_cache['$post_id'][$key][$index] = $original_value; 
     513        if ( !empty($cache_key) ) 
     514            foreach ($cache_key as $index => $data) 
     515                $post_meta_cache['$post_id'][$key][$index] = $original_value; 
    515516    } else { 
    516517        $wpdb->query("UPDATE $wpdb->postmeta SET meta_value = '$value' WHERE 
    517518meta_key = '$key' AND post_id = '$post_id' AND meta_value = '$prev_value'"); 
    518519        $cache_key = $post_meta_cache['$post_id'][$key]; 
    519         foreach ($cache_key as $index => $data) 
    520             if ( $data == $original_prev ) 
    521                 $post_meta_cache['$post_id'][$key][$index] = $original_value; 
     520        if ( !empty($cache_key) ) 
     521            foreach ($cache_key as $index => $data) 
     522                if ( $data == $original_prev ) 
     523                    $post_meta_cache['$post_id'][$key][$index] = $original_value; 
    522524    } 
    523525