Changeset 7391

Timestamp:

03/18/2008 11:24:04 PM (19 years ago)

Author:

markjaquith

Message:

moderation.php is no more. All hail edit-comments.php?comment_status=moderated

Location:

trunk

Files:

• wp-admin/edit-form-comment.php (modified) (1 diff)
• wp-admin/includes/comment.php (modified) (1 diff)
• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-admin/options-discussion.php (modified) (1 diff)
• wp-includes/pluggable.php (modified) (1 diff)

trunk/wp-admin/edit-form-comment.php

@@ -56 +56 @@
 <ul>
 <li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li>
-<li><a href="moderation.php"><?php _e('Moderate Comments') ?></a></li>
+<li><a href="edit-comments.php?comment_status=moderated"><?php _e('Moderate Comments') ?></a></li>
 <?php do_action('comment_relatedlinks_list'); ?>
 </ul>

trunk/wp-admin/includes/comment.php

@@ -89 +89 @@
 }
 
-if ( is_admin() && ('edit-comments.php' == $pagenow || 'moderation.php' == $pagenow || 'edit.php' == $pagenow) ) {
+if ( is_admin() && ('edit-comments.php' == $pagenow || 'edit.php' == $pagenow) ) {
         if ( get_option('show_avatars') )
                 add_filter( 'comment_author', 'floated_admin_avatar' );

trunk/wp-admin/includes/dashboard.php

@@ -25 +25 @@
         if ( current_user_can( 'moderate_comments' ) && $mod_comments = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'") ) {
                 $notice = sprintf( __ngettext( '%d comment awaiting moderation', '%d comments awaiting moderation', $mod_comments ), $mod_comments );
-                $notice = "<a href='moderation.php'>$notice</a>";
+                $notice = "<a href='edit-comments.php?comment_status=moderated'>$notice</a>";
         } else {
                 $notice = '';

trunk/wp-admin/options-discussion.php

@@ -60 +60 @@
 <p><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_option('comment_max_links'). '" />' ) ?></p>
 
-<p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="moderation.php">moderation queue</a>. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p>
+<p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p>
 <p>
 <textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('moderation_keys'); ?></textarea>

trunk/wp-includes/pluggable.php

@@ -896 +896 @@
         $strCommentsPending = sprintf( __ngettext('%s comment', '%s comments', $comments_waiting), $comments_waiting );
         $notify_message .= sprintf( __('Currently %s are waiting for approval. Please visit the moderation panel:'), $strCommentsPending ) . "\r\n";
-        $notify_message .= get_option('siteurl') . "/wp-admin/moderation.php\r\n";
+        $notify_message .= get_option('siteurl') . "/wp-admin/edit-comments.php?comment_status=moderated\r\n";
 
         $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), get_option('blogname'), $post->post_title );