Changeset 13247

Timestamp:

02/20/2010 11:48:38 AM (15 years ago)

Author:

nacin

Message:

Show awareness of comment's current status when moderating via e-mail/AYS. Show message on AYS screen of comment's status if not unapproved. Skip AYS when trying to re-approve (or delete or spam) a comment and show a message. See #11441

Location:

trunk/wp-admin

Files:

• comment.php (modified) (2 diffs)
• edit-comments.php (modified) (3 diffs)

trunk/wp-admin/comment.php

@@ -84 +84 @@
     }
 
+    // No need to re-approve/re-trash/re-spam a comment.
+    if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
+        wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
+        die();
+    }
+
     require_once('admin-header.php');
 
@@ -117 +123 @@
         break;
 }
+
+if ( $comment->comment_approved != '0' ) { // if not unapproved
+    $message = '';
+    switch ( $comment->comment_approved ) {
+        case '1' :
+            $message = __('This comment is currently approved.');
+            break;
+        case 'spam' :
+            $message  = __('This comment is currently marked as spam.');
+            break;
+        case 'trash' :
+            $message  = __('This comment is currently in the Trash.');
+            break;
+    }
+    if ( $message )
+        echo '<div class="updated"><p>' . $message . '</p></div>';
+}
 ?>
-
 <p><strong><?php _e('Caution:'); ?></strong> <?php echo $caution_msg; ?></p>
 

trunk/wp-admin/edit-comments.php

@@ -142 +142 @@
 }
 
-if ( isset($_GET['approved']) || isset($_GET['deleted']) || isset($_GET['trashed']) || isset($_GET['untrashed']) || isset($_GET['spammed']) || isset($_GET['unspammed']) ) {
+if ( isset($_GET['approved']) || isset($_GET['deleted']) || isset($_GET['trashed']) || isset($_GET['untrashed']) || isset($_GET['spammed']) || isset($_GET['unspammed']) || isset($_GET['same']) ) {
     $approved  = isset( $_GET['approved']  ) ? (int) $_GET['approved']  : 0;
     $deleted   = isset( $_GET['deleted']   ) ? (int) $_GET['deleted']   : 0;
@@ -149 +149 @@
     $spammed   = isset( $_GET['spammed']   ) ? (int) $_GET['spammed']   : 0;
     $unspammed = isset( $_GET['unspammed'] ) ? (int) $_GET['unspammed'] : 0;
-
-    if ( $approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 ) {
+    $same      = isset( $_GET['same'] )      ? (int) $_GET['same']      : 0;
+
+    if ( $approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 || $same > 0 ) {
         if ( $approved > 0 )
             $messages[] = sprintf( _n( '%s comment approved', '%s comments approved', $approved ), $approved );
@@ -172 +173 @@
         if ( $deleted > 0 )
             $messages[] = sprintf( _n( '%s comment permanently deleted', '%s comments permanently deleted', $deleted ), $deleted );
+
+        if ( $same > 0 && $comment = get_comment( $same ) ) {
+            switch ( $comment->comment_approved ) {
+                case '1' :
+                    $messages[] = __('This comment is already approved.') . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
+                    break;
+                case 'trash' :
+                    $messages[] = __( 'This comment is already in the Trash.' ) . ' <a href="' . esc_url( admin_url( 'edit-comments.php?comment_status=trash' ) ) . '"> ' . __( 'View Trash' ) . '</a>';
+                    break;
+                case 'spam' :
+                    $messages[] = __( 'This comment is already marked as spam.' ) . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
+                    break;
+            }
+        }
 
         echo '<div id="moderated" class="updated"><p>' . implode( "<br/>\n", $messages ) . '</p></div>';