Changes in trunk/src/wp-admin/includes/ajax-actions.php [33468:34170]

File:

• trunk/src/wp-admin/includes/ajax-actions.php (modified) (15 diffs)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -348 +348 @@
 
     // JS didn't send us everything we need to know. Just die with success message
-    if ( !$total || !$per_page || !$page || !$url )
-        wp_die( time() );
+    if ( ! $total || ! $per_page || ! $page || ! $url ) {
+        $time = time();
+        $comment = get_comment( $comment_id );
+
+        $x = new WP_Ajax_Response( array(
+            'what' => 'comment',
+            // Here for completeness - not used.
+            'id' => $comment_id,
+            'supplemental' => array(
+                'status' => $comment ? $comment->comment_approved : '',
+                'postId' => $comment ? $comment->comment_post_ID : '',
+                'time' => $time
+            )
+        ) );
+        $x->send();
+    }
 
     $total += $delta;
@@ -358 +372 @@
     if ( 0 == $total % $per_page || 1 == mt_rand( 1, $per_page ) ) {
         $post_id = 0;
-        $status = 'total_comments'; // What type of comment count are we looking for?
+        // What type of comment count are we looking for?
+        $status = 'all';
         $parsed = parse_url( $url );
         if ( isset( $parsed['query'] ) ) {
@@ -378 +393 @@
     // The time since the last comment count.
     $time = time();
+    $comment = get_comment( $comment_id );
 
     $x = new WP_Ajax_Response( array(
@@ -384 +400 @@
         'id' => $comment_id,
         'supplemental' => array(
+            'status' => $comment ? $comment->comment_approved : '',
+            'postId' => $comment ? $comment->comment_post_ID : '',
             'total_items_i18n' => sprintf( _n( '%s item', '%s items', $total ), number_format_i18n( $total ) ),
             'total_pages' => ceil( $total / $per_page ),
@@ -504 +522 @@
 
     check_ajax_referer( "delete-comment_$id" );
-    $status = wp_get_comment_status( $comment->comment_ID );
+    $status = wp_get_comment_status( $comment );
 
     $delta = -1;
@@ -510 +528 @@
         if ( 'trash' == $status )
             wp_die( time() );
-        $r = wp_trash_comment( $comment->comment_ID );
+        $r = wp_trash_comment( $comment );
     } elseif ( isset($_POST['untrash']) && 1 == $_POST['untrash'] ) {
         if ( 'trash' != $status )
             wp_die( time() );
-        $r = wp_untrash_comment( $comment->comment_ID );
+        $r = wp_untrash_comment( $comment );
         if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'trash' ) // undo trash, not in trash
             $delta = 1;
@@ -520 +538 @@
         if ( 'spam' == $status )
             wp_die( time() );
-        $r = wp_spam_comment( $comment->comment_ID );
+        $r = wp_spam_comment( $comment );
     } elseif ( isset($_POST['unspam']) && 1 == $_POST['unspam'] ) {
         if ( 'spam' != $status )
             wp_die( time() );
-        $r = wp_unspam_comment( $comment->comment_ID );
+        $r = wp_unspam_comment( $comment );
         if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'spam' ) // undo spam, not in spam
             $delta = 1;
     } elseif ( isset($_POST['delete']) && 1 == $_POST['delete'] ) {
-        $r = wp_delete_comment( $comment->comment_ID );
+        $r = wp_delete_comment( $comment );
     } else {
         wp_die( -1 );
@@ -714 +732 @@
         wp_die( -1 );
 
-    $current = wp_get_comment_status( $comment->comment_ID );
+    $current = wp_get_comment_status( $comment );
     if ( isset( $_POST['new'] ) && $_POST['new'] == $current )
         wp_die( time() );
 
     check_ajax_referer( "approve-comment_$id" );
-    if ( in_array( $current, array( 'unapproved', 'spam' ) ) )
-        $result = wp_set_comment_status( $comment->comment_ID, 'approve', true );
-    else
-        $result = wp_set_comment_status( $comment->comment_ID, 'hold', true );
+    if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) {
+        $result = wp_set_comment_status( $comment, 'approve', true );
+    } else {
+        $result = wp_set_comment_status( $comment, 'hold', true );
+    }
 
     if ( is_wp_error($result) ) {
@@ -995 +1014 @@
 
         if ( $parent && $parent->comment_approved === '0' && $parent->comment_post_ID == $comment_post_ID ) {
-            if ( wp_set_comment_status( $parent->comment_ID, 'approve' ) )
+            if ( ! current_user_can( 'edit_comment', $parent->comment_ID ) ) {
+                wp_die( -1 );
+            }
+
+            if ( wp_set_comment_status( $parent, 'approve' ) )
                 $comment_auto_approved = true;
         }
@@ -1028 +1051 @@
 
     if ( $comment_auto_approved )
-        $response['supplemental'] = array( 'parent_approved' => $parent->comment_ID );
+        $response['supplemental'] = array( 'parent_approved' => $parent->comment_ID, 'parent_post_id' => $parent->comment_post_ID );
 
     $x = new WP_Ajax_Response();
@@ -1178 +1201 @@
         // If the post is an autodraft, save the post as a draft and then attempt to save the meta.
         if ( $post->post_status == 'auto-draft' ) {
-            $save_POST = $_POST; // Backup $_POST
-            $_POST = array(); // Make it empty for edit_post()
-            $_POST['action'] = 'draft'; // Warning fix
-            $_POST['post_ID'] = $pid;
-            $_POST['post_type'] = $post->post_type;
-            $_POST['post_status'] = 'draft';
+            $post_data = array();
+            $post_data['action'] = 'draft'; // Warning fix
+            $post_data['post_ID'] = $pid;
+            $post_data['post_type'] = $post->post_type;
+            $post_data['post_status'] = 'draft';
             $now = current_time('timestamp', 1);
-            $_POST['post_title'] = sprintf( __( 'Draft created on %1$s at %2$s' ), date( get_option( 'date_format' ), $now ), date( get_option( 'time_format' ), $now ) );
-
-            if ( $pid = edit_post() ) {
+            $post_data['post_title'] = sprintf( __( 'Draft created on %1$s at %2$s' ), date( get_option( 'date_format' ), $now ), date( get_option( 'time_format' ), $now ) );
+
+            $pid = edit_post( $post_data );
+            if ( $pid ) {
                 if ( is_wp_error( $pid ) ) {
                     $x = new WP_Ajax_Response( array(
@@ -1195 +1218 @@
                     $x->send();
                 }
-                $_POST = $save_POST; // Now we can restore original $_POST again
+
                 if ( !$mid = add_meta( $pid ) )
                     wp_die( __( 'Please provide a custom field value.' ) );
@@ -1505 +1528 @@
     check_ajax_referer( 'getpermalink', 'getpermalinknonce' );
     $post_id = isset($_POST['post_id'])? intval($_POST['post_id']) : 0;
-    wp_die( add_query_arg( array( 'preview' => 'true' ), get_permalink( $post_id ) ) );
+    wp_die( get_preview_post_link( $post_id ) );
 }
 
@@ -1893 +1916 @@
             'success' => false,
             'data'    => array(
-                'message'  => __( "You don't have permission to upload files." ),
+                'message'  => __( 'You do not have permission to upload files.' ),
                 'filename' => $_FILES['async-upload']['name'],
             )
@@ -3133 +3156 @@
             $cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication.
 
-            $parent_url = get_post( $attachment_id )->guid;
+            $parent_url = wp_get_attachment_url( $attachment_id );
             $url        = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );