Changeset 3671

Timestamp:

03/31/2006 08:32:30 AM (19 years ago)

Author:

ryan

Message:

Prompt for confirmation for mailapprovecomment action. Props mdawaffe. fixes #2615

Location:

trunk

Files:

• wp-admin/comment.php (modified) (5 diffs)
• wp-admin/edit.php (modified) (1 diff)
• wp-includes/functions-formatting.php (modified) (1 diff)

trunk/wp-admin/comment.php

@@ -42 +42 @@
 
 case 'confirmdeletecomment':
+case 'mailapprovecomment':
 
     require_once('./admin-header.php');
@@ -47 +48 @@
     $comment = (int) $_GET['comment'];
     $p = (int) $_GET['p'];
+    $formaction = 'confirmdeletecomment' == $action ? 'deletecomment' : 'approvecomment';
 
     if ( ! $comment = get_comment($comment) )
@@ -52 +54 @@
 
     if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-        die( __('You are not allowed to delete comments on this post.') );
+        die( 'confirmdeletecomment' == $action ? __('You are not allowed to delete comments on this post.') : __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
 
     echo "<div class='wrap'>\n";
     if ( 'spam' == $_GET['delete_type'] )
         echo "<p>" . __('<strong>Caution:</strong> You are about to mark the following comment as spam:') . "</p>\n";
+    elseif ( 'confirmdeletecomment' == $action )
+        echo "<p>" . __('<strong>Caution:</strong> You are about to delete the following comment:') . "</p>\n";
     else
-        echo "<p>" . __('<strong>Caution:</strong> You are about to delete the following comment:') . "</p>\n";
+        echo "<p>" . __('<strong>Caution:</strong> You are about to approve the following comment:') . "</p>\n";
     echo "<table border='0'>\n";
     echo "<tr><td>" . __('Author:') . "</td><td>$comment->comment_author</td></tr>\n";
@@ -68 +72 @@
 
     echo "<form action='".get_settings('siteurl')."/wp-admin/comment.php' method='get'>\n";
-    echo "<input type='hidden' name='action' value='deletecomment' />\n";
+    echo "<input type='hidden' name='action' value='$formaction' />\n";
     if ( 'spam' == $_GET['delete_type'] )
         echo "<input type='hidden' name='delete_type' value='spam' />\n";
@@ -143 +147 @@
     break;
 
-case 'mailapprovecomment':
-
-    $comment = (int) $_GET['comment'];
-
-    if ( ! $comment = get_comment($comment) )
-             die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
-
-    if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-        die( __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
-
-    if ('1' != $comment->comment_approved) {
-        wp_set_comment_status($comment->comment_ID, 'approve');
-        if (true == get_option('comments_notify'))
-            wp_notify_postauthor($comment->comment_ID);
-    }
-
-    header('Location: ' . get_option('siteurl') . '/wp-admin/moderation.php?approved=1');
-    exit();
-    break;
-
 case 'approvecomment':
 

trunk/wp-admin/edit.php

@@ -250 +250 @@
     if ($comments) {
     ?> 
-<h3><?php _e('Comments') ?></h3> 
+<h3 id="comments"><?php _e('Comments') ?></h3> 
 <ol id="the-list"> 
 <?php

trunk/wp-includes/functions-formatting.php

@@ -99 +99 @@
 function wp_specialchars( $text, $quotes = 0 ) {
     // Like htmlspecialchars except don't double-encode HTML entities
-    $text = preg_replace('/&([^#])(?![a-z1-4]{1,8};)/', '&$1', $text);-
+    $text = preg_replace('/&([^#])(?![a-z1-4]{1,8};)/', '&$1', $text);
     $text = str_replace('<', '&lt;', $text);
     $text = str_replace('>', '&gt;', $text);