Changeset 1143:fbf575ae9bda for admin/comments.php

Timestamp:

04/04/13 16:04:11 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

1144:4af82896ca3d, 1155:49ba58cbf593

Message:

Display "Delete all spams" button as far as it is useful. Fixes #1398

File:

• admin/comments.php (modified) (2 diffs)

admin/comments.php

@@ -225 +225 @@
      '</form>';
      
-     if (!$with_spam) {
-
-          $spam_count = $core->blog->getComments(array('comment_status'=>-2),true)->f(0);
+     $spam_count = $core->blog->getComments(array('comment_status'=>-2),true)->f(0);
+     if ($spam_count > 0) {
           
-          if ($spam_count > 0) {
-               
-               echo 
-                    '<form action="comments.php" method="post" class="fieldset">';
-
+          echo 
+               '<form action="comments.php" method="post" class="fieldset">';
+
+          if (!$with_spam || ($status != -2)) {
                if ($spam_count == 1) {
                     echo '<p>'.sprintf(__('You have one spam comments.'),'<strong>'.$spam_count.'</strong>').' '.
@@ -241 +239 @@
                     '<a href="comments.php?status=-2">'.__('Show them.').'</a></p>';
                }
-               
-               echo
-                    $core->formNonce().
-                    '<input name="delete_all_spam" class="delete" type="submit" value="'.__('Delete all spams').'" /></p>';
-
-               # --BEHAVIOR-- adminCommentsSpamForm
-               $core->callBehavior('adminCommentsSpamForm',$core);
-
-               echo '</form>';
           }
+          
+          echo
+               $core->formNonce().
+               '<input name="delete_all_spam" class="delete" type="submit" value="'.__('Delete all spams').'" /></p>';
+
+          # --BEHAVIOR-- adminCommentsSpamForm
+          $core->callBehavior('adminCommentsSpamForm',$core);
+
+          echo '</form>';
      }