Changeset 11750

Timestamp:

07/30/2009 02:55:07 PM (15 years ago)

Author:

azaozz

Message:

Trash status update, see #4529

Location:

trunk/wp-includes

Files:

• functions.php (modified) (2 diffs)
• post.php (modified) (3 diffs)

trunk/wp-includes/functions.php

@@ -3353 +3353 @@
     $delete_timestamp = time() - (60*60*24*EMPTY_TRASH_DAYS);
 
-    foreach ( $trash_meta['comments'] as $id => $meta ) {
+    foreach ( (array) $trash_meta['comments'] as $id => $meta ) {
         if ( $meta['time'] < $delete_timestamp ) {
             wp_delete_comment($id);
@@ -3359 +3359 @@
         }
     }
-    foreach ( $trash_meta['posts'] as $id => $meta ) {
+    foreach ( (array) $trash_meta['posts'] as $id => $meta ) {
         if ( $meta['time'] < $delete_timestamp ) {
             wp_delete_post($id);
-            unset($to_delete['posts'][$id]);
+            unset($trash_meta['posts'][$id]);
         }
     }
 
-    update_option('wp_scheduled_delete', $to_delete);
-}
+    update_option('wp_trash_meta', $trash_meta);
+}

trunk/wp-includes/post.php

@@ -1250 +1250 @@
 
 /**
- * Removes a post or page from the Trash
+ * Restores a post or page from the Trash
  *
  * @since 2.9.0
@@ -1260 +1260 @@
  */
 function wp_untrash_post($postid = 0) {
-    if (!$post = wp_get_single_post($postid, ARRAY_A))
+    if ( !$post = wp_get_single_post($postid, ARRAY_A) )
         return $post;
 
     do_action('untrash_post', $postid);
-    
+
     $post['post_status'] = 'draft';
-    
+
     $trash_meta = get_option('wp_trash_meta');
-    if (is_array($trash_meta) && isset($trash_meta['posts'][$postid])) {
+    if ( is_array($trash_meta) && isset($trash_meta['posts'][$postid]) ) {
         $post['post_status'] = $trash_meta['posts'][$postid]['status'];
         unset($trash_meta['posts'][$postid]);
         update_option('wp_trash_meta', $trash_meta);
     }
-    
+
     wp_insert_post($post);
-    
+
     do_action('untrashed_post', $postid);
 
@@ -2663 +2663 @@
     if ( 'attachment' != $post->post_type )
         return false;
-    
+
     if ( 'trash' != $post->post_status )
         return wp_trash_post($postid);