Changeset 3190

Timestamp:

11/22/2005 12:36:36 AM (21 years ago)

Author:

ryan

Message:

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

Location:

trunk

Files:

• wp-admin/admin-functions.php (modified) (1 diff)
• wp-includes/functions-post.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -176 +176 @@
     }
 
+    // Meta Stuff
+    if ($_POST['meta']) {
+        foreach ($_POST['meta'] as $key => $value)
+            update_meta($key, $value['key'], $value['value']);
+    }
+    
+    if ($_POST['deletemeta']) {
+        foreach ($_POST['deletemeta'] as $key => $value)
+            delete_meta($key);
+    }
+
+    add_meta($post_ID);
+
     wp_update_post($_POST);
 
     // Now that we have an ID we can fix any attachment anchor hrefs
-    fix_attachment_links($_POST['ID']);
-
-    // Meta Stuff
-    if ($_POST['meta'])
-        : foreach ($_POST['meta'] as $key => $value)
-            : update_meta($key, $value['key'], $value['value']);
-    endforeach;
-    endif;
-
-    if ($_POST['deletemeta'])
-        : foreach ($_POST['deletemeta'] as $key => $value)
-            : delete_meta($key);
-    endforeach;
-    endif;
-
-    add_meta($post_ID);
+    fix_attachment_links($post_ID);
 
     return $post_ID;

trunk/wp-includes/functions-post.php

@@ -185 +185 @@
         generate_page_rewrite_rules();
 
-        if ( empty($page_template) )
-            $page_template = 'Default Template';
-
-        if ( ! update_post_meta($post_ID, '_wp_page_template',  $page_template))
-            add_post_meta($post_ID, '_wp_page_template',  $page_template, true);
+        if ( !empty($page_template) )
+            if ( ! update_post_meta($post_ID, '_wp_page_template',  $page_template))
+                add_post_meta($post_ID, '_wp_page_template',  $page_template, true);
     }
 

trunk/wp-includes/functions.php

@@ -511 +511 @@
 meta_key = '$key' AND post_id = '$post_id'");
         $cache_key = $post_meta_cache['$post_id'][$key];
-        foreach ($cache_key as $index => $data)
-            $post_meta_cache['$post_id'][$key][$index] = $original_value;
+        if ( !empty($cache_key) )
+            foreach ($cache_key as $index => $data)
+                $post_meta_cache['$post_id'][$key][$index] = $original_value;
     } else {
         $wpdb->query("UPDATE $wpdb->postmeta SET meta_value = '$value' WHERE
 meta_key = '$key' AND post_id = '$post_id' AND meta_value = '$prev_value'");
         $cache_key = $post_meta_cache['$post_id'][$key];
-        foreach ($cache_key as $index => $data)
-            if ( $data == $original_prev )
-                $post_meta_cache['$post_id'][$key][$index] = $original_value;
+        if ( !empty($cache_key) )
+            foreach ($cache_key as $index => $data)
+                if ( $data == $original_prev )
+                    $post_meta_cache['$post_id'][$key][$index] = $original_value;
     }