Changeset 37743

Timestamp:

06/17/2016 09:47:58 PM (7 years ago)

Author:

rachelbaker

Message:

Comments: Wrap or unwrap the List Table comment_date as comment status changes via Ajax.

Introduced in [36521].

Fixes #36742.
Props imath, adamsilverstein.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (3 diffs)
• wp-includes/js/wp-lists.js (modified) (1 diff)

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

@@ -353 +353 @@
     // JS didn't send us everything we need to know. Just die with success message
     if ( ! $total || ! $per_page || ! $page || ! $url ) {
-        $time = time();
-        $comment = get_comment( $comment_id );
+        $time           = time();
+        $comment        = get_comment( $comment_id );
+        $comment_status = '';
+        $comment_link   = '';
+
+        if ( $comment ) {
+            $comment_status = $comment->comment_approved;
+        }
+
+        if ( 1 === (int) $comment_status ) {
+            $comment_link = get_comment_link( $comment );
+        }
 
         $counts = wp_count_comments();
@@ -363 +373 @@
             'id' => $comment_id,
             'supplemental' => array(
-                'status' => $comment ? $comment->comment_approved : '',
+                'status' => $comment_status,
                 'postId' => $comment ? $comment->comment_post_ID : '',
                 'time' => $time,
@@ -374 +384 @@
                     _nx( '%s in moderation', '%s in moderation', $counts->moderated, 'comments' ),
                     number_format_i18n( $counts->moderated )
-                )
+                ),
+                'comment_link' => $comment_link,
             )
         ) );

trunk/src/wp-includes/js/wp-lists.js

@@ -298 +298 @@
             rres = r;
 
+            if ( 'undefined' !== typeof res.responses[0].supplemental.comment_link ) {
+                var submittedOn = element.find( '.submitted-on' ),
+                    commentLink = submittedOn.find( 'a' );
+
+                // Comment is approved; link the date field.
+                if ( '' !== res.responses[0].supplemental.comment_link ) {
+                    submittedOn.html( $('<a></a>').text( submittedOn.text() ).prop( 'href', res.responses[0].supplemental.comment_link ) );
+
+                // Comment is not approved; unlink the date field.
+                } else if ( commentLink.length ) {
+                    submittedOn.text( commentLink.text() );
+                }
+            }
+
             if ( !res || res.errors ) {
                 element.stop().stop().css( 'backgroundColor', '#FF3333' )[isClass?'removeClass':'addClass'](s.dimClass).show().queue( function() { list.wpList.recolor(); $(this).dequeue(); } );