Ticket #15527: garyc40-15527.patch

wp-admin/admin-ajax.php

@@ -317 +317 @@
         $x->send();
 }
 
+function _wp_add_comment( $action ) {
+        global $wpdb;
+        
+        check_ajax_referer( 'replyto-comment', '_ajax_nonce-replyto-comment' );
+
+        set_current_screen( 'edit-comments' );
+
+        $comment_post_ID = (int) $_POST['comment_post_ID'];
+        if ( !current_user_can( 'edit_post', $comment_post_ID ) )
+                die('-1');
+
+        $error_messages = array(
+                'replyto-comment' => array(
+                        'invalid_status' => __('Error: you are replying to a comment on a draft post.'),
+                        'must_log_in' => __('Sorry, you must be logged in to reply to a comment.'),
+                        'type_something' => __('Error: please type a comment.'),
+                ),
+                'add-comment' => array(
+                        'invalid_status' => __('Error: you are adding comment on a draft post.'),
+                        'must_log_in' => __('Sorry, you must be logged in to add a comment.'),
+                        'type_something' => __('Error: please type a comment.'),
+                ),
+        );
+
+        $status = get_post_status( $comment_post_ID );
+
+        if ( empty($status) )
+                die('1');
+        elseif ( in_array($status, array('draft', 'pending', 'trash') ) )
+                die( $error_messages[$action]['invalid_status'] );
+
+        $user = wp_get_current_user();
+        if ( ! $user->ID ) {
+                die( $error_messages[$action]['must_log_in'] );
+        }
+        
+        $comment_content      = trim($_POST['content']);
+        
+        if ( '' == $comment_content )
+                die( $error_messages[$action]['type_something'] );
+        
+        $comment_author       = $wpdb->escape($user->display_name);
+        $comment_author_email = $wpdb->escape($user->user_email);
+        $comment_author_url   = $wpdb->escape($user->user_url);
+        $comment_type         = '';
+        
+        if ( current_user_can('unfiltered_html') ) {
+                if ( wp_create_nonce('unfiltered-html-comment_' . $comment_post_ID) != $_POST['_wp_unfiltered_html_comment'] ) {
+                        kses_remove_filters(); // start with a clean slate
+                        kses_init_filters(); // set up the filters
+                }
+        }
+
+        $comment_parent = ( $action == 'replyto-comment' ) ? absint($_POST['comment_ID']) : 0;
+        $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID');
+
+        $comment_id = wp_new_comment( $commentdata );
+        $comment = get_comment($comment_id);
+        if ( ! $comment ) die('1');
+
+        $position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
+
+        $x = new WP_Ajax_Response();
+
+        ob_start();
+                if ( 'dashboard' == $_REQUEST['mode'] ) {
+                        require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );
+                        _wp_dashboard_recent_comments_row( $comment );
+                } else {
+                        if ( 'single' == $_REQUEST['mode'] ) {
+                                $wp_list_table = get_list_table('WP_Post_Comments_List_Table');
+                        } else {                                
+                                $wp_list_table = get_list_table('WP_Comments_List_Table');
+                        }
+                        $wp_list_table->single_row( $comment );
+                }
+                $comment_list_item = ob_get_contents();
+        ob_end_clean();
+
+        $x->add( array(
+                'what' => 'comment',
+                'id' => $comment->comment_ID,
+                'data' => $comment_list_item,
+                'position' => $position
+        ));
+
+        $x->send();
+        break;
+}
+
 $id = isset($_POST['id'])? (int) $_POST['id'] : 0;
 switch ( $action = $_POST['action'] ) :
 case 'delete-comment' : // On success, die with time() instead of 1
@@ -620 +710 @@
         ) );
         $x->send();
         break;
-case 'replyto-comment' :
-        check_ajax_referer( $action, '_ajax_nonce-replyto-comment' );
-
-        set_current_screen( 'edit-comments' );
-
-        $comment_post_ID = (int) $_POST['comment_post_ID'];
-        if ( !current_user_can( 'edit_post', $comment_post_ID ) )
-                die('-1');
-
-        $status = $wpdb->get_var( $wpdb->prepare("SELECT post_status FROM $wpdb->posts WHERE ID = %d", $comment_post_ID) );
-
-        if ( empty($status) )
-                die('1');
-        elseif ( in_array($status, array('draft', 'pending', 'trash') ) )
-                die( __('Error: you are replying to a comment on a draft post.') );
-
-        $user = wp_get_current_user();
-        if ( $user->ID ) {
-                $comment_author       = $wpdb->escape($user->display_name);
-                $comment_author_email = $wpdb->escape($user->user_email);
-                $comment_author_url   = $wpdb->escape($user->user_url);
-                $comment_content      = trim($_POST['content']);
-                if ( current_user_can('unfiltered_html') ) {
-                        if ( wp_create_nonce('unfiltered-html-comment_' . $comment_post_ID) != $_POST['_wp_unfiltered_html_comment'] ) {
-                                kses_remove_filters(); // start with a clean slate
-                                kses_init_filters(); // set up the filters
-                        }
-                }
-        } else {
-                die( __('Sorry, you must be logged in to reply to a comment.') );
-        }
-
-        if ( '' == $comment_content )
-                die( __('Error: please type a comment.') );
-
-        $comment_parent = absint($_POST['comment_ID']);
-        $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID');
-
-        $comment_id = wp_new_comment( $commentdata );
-        $comment = get_comment($comment_id);
-        if ( ! $comment ) die('1');
-
-        $position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
-
-        $x = new WP_Ajax_Response();
-
-        ob_start();
-                if ( 'dashboard' == $_REQUEST['mode'] ) {
-                        require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );
-                        _wp_dashboard_recent_comments_row( $comment );
-                } else {
-                        if ( 'single' == $_REQUEST['mode'] ) {
-                                $wp_list_table = get_list_table('WP_Post_Comments_List_Table');
-                        } else {                                
-                                $wp_list_table = get_list_table('WP_Comments_List_Table');
-                        }
-                        $wp_list_table->single_row( $comment );
-                }
-                $comment_list_item = ob_get_contents();
-        ob_end_clean();
-
-        $x->add( array(
-                'what' => 'comment',
-                'id' => $comment->comment_ID,
-                'data' => $comment_list_item,
-                'position' => $position
-        ));
-
-        $x->send();
+case 'add-comment':
+case 'replyto-comment':
+        _wp_add_comment( $_POST['action'] );
         break;
 case 'edit-comment' :
         check_ajax_referer( 'replyto-comment', '_ajax_nonce-replyto-comment' );

wp-admin/css/colors-classic.dev.css

@@ -1315 +1315 @@
 }
 
 #edithead,
-#replyhead {
+#replyhead,
+#addhead {
         background-color: #f1f1f1;
 }
 

wp-admin/css/colors-fresh.dev.css

@@ -1312 +1312 @@
 }
 
 #edithead,
-#replyhead {
+#replyhead,
+#addhead {
         background-color: #f1f1f1;
 }
 

wp-admin/css/dashboard-rtl.dev.css

@@ -41 +41 @@
         float: left;
         clear: left;
 }
-#dashboard-widgets h3 .postbox-title-action {
-        right: auto;
-        left: 30px;
-}
 #the-comment-list .pingback {
         padding-left: 0 !important;
         padding-right: 9px !important;

wp-admin/css/dashboard.dev.css

@@ -1 +1 @@
 .postbox p, .postbox ul, .postbox ol, .postbox blockquote, #wp-version-message { font-size: 11px; }
 
-.edit-box {
-        display: none;
-}
-
-h3:hover .edit-box {
-        display: inline;
-}
-
 form .input-text-wrap {
         border-style: solid;
         border-width: 1px;
@@ -69 +61 @@
         text-decoration: underline;
 }
 
-#dashboard-widgets h3 .postbox-title-action {
-        position: absolute;
-        right: 30px;
-        padding: 0;
-}
-
 #dashboard-widgets h4 {
         font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
         font-size: 13px;

wp-admin/css/wp-admin-rtl.dev.css

@@ -558 +558 @@
         padding-left: 0.5%;
         padding-right: 0;
 }
+.postbox h3 .postbox-title-action {
+        right: auto;
+        left: 30px;
+}
 
 /* Media library */
 #wpbody-content .describe th {

wp-admin/css/wp-admin.dev.css

@@ -1199 +1199 @@
         padding: 6px 0;
 }
 
+.postbox h3 .postbox-title-action {
+        display:none;
+        position:absolute;
+        right:30px;
+        padding:0;
+}
+
+.postbox h3:hover .postbox-title-action {
+        display:inline;
+}
+
 .postbox .hndle {
         cursor: move;
 }
@@ -3470 +3481 @@
         display: none;
 }
 
-#replyhead {
+#addhead, #replyhead {
         font-size: 12px;
         font-weight: bold;
         padding: 2px 10px 4px;

wp-admin/edit-form-advanced.php

@@ -146 +146 @@
         add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', $post_type, 'normal', 'core');
 
 if ( ('publish' == $post->post_status || 'private' == $post->post_status) && post_type_supports($post_type, 'comments') )
-        add_meta_box('commentsdiv', __('Comments'), 'post_comment_meta_box', $post_type, 'normal', 'core');
+        add_meta_box('commentsdiv', sprintf( '%s<span class="postbox-title-action"><a href="#">%s</a></span>', __('Comments'), __('Add new comment') ), 'post_comment_meta_box', $post_type, 'normal', 'core');
 
 if ( !( 'pending' == $post->post_status && !current_user_can( $post_type_object->cap->publish_posts ) ) )
         add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', $post_type, 'normal', 'core');

wp-admin/includes/template.php

@@ -341 +341 @@
 <div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;">
 <?php endif; ?>
         <div id="replyhead" style="display:none;"><?php _e('Reply to Comment'); ?></div>
+        
+        <div id="addhead" style="display:none;"><?php _e('Add new Comment'); ?></div>
 
         <div id="edithead" style="display:none;">
                 <div class="inside">
@@ -365 +367 @@
         <p id="replysubmit" class="submit">
         <a href="#comments-form" class="cancel button-secondary alignleft" tabindex="106"><?php _e('Cancel'); ?></a>
         <a href="#comments-form" class="save button-primary alignright" tabindex="104">
+        <span id="addbtn" style="display:none;"><?php _e('Add Comment'); ?></span>
         <span id="savebtn" style="display:none;"><?php _e('Update Comment'); ?></span>
         <span id="replybtn" style="display:none;"><?php _e('Submit Reply'); ?></span></a>
         <img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />

wp-admin/js/edit-comments.dev.js

@@ -281 +281 @@
                 $(listTable).bind('beforeChangePage', function(){
                         commentReply.close();
                 });
+                
+                $('#commentsdiv .postbox-title-action a').click(function(){
+                        var postID = $('input[name=post_ID]').val();
+                        commentReply.open('new', postID, 'add');
+                        return false;
+                });
         },
 
         addEvents : function(r) {
@@ -341 +347 @@
                 $('td', '#replyrow').attr('colspan', $('table.widefat thead th:visible').length);
                 editRow = $('#replyrow');
                 rowData = $('#inline-'+id);
-                act = t.act = (a == 'edit') ? 'edit-comment' : 'replyto-comment';
+                
+                if (! a) {
+                        a = 'replyto';
+                }
+                
+                act = t.act = a + '-comment';
 
                 $('#action', editRow).val(act);
                 $('#comment_post_ID', editRow).val(p);
@@ -354 +365 @@
                         $('#status', editRow).val( $('div.comment_status', rowData).text() );
                         $('#replycontent', editRow).val( $('textarea.comment', rowData).val() );
                         $('#edithead, #savebtn', editRow).show();
-                        $('#replyhead, #replybtn', editRow).hide();
+                        $('#replyhead, #replybtn, #addhead, #addbtn', editRow).hide();
 
                         h = c.height();
                         if ( h > 220 )
@@ -366 +377 @@
                         c.after( editRow ).fadeOut('fast', function(){
                                 $('#replyrow').fadeIn(300, function(){ $(this).show() });
                         });
+                } else if (a == 'add') {
+                        $('#addhead, #addbtn', editRow).show();
+                        $('#replyhead, #replybtn, #edithead, #editbtn', editRow).hide();
+                        $('#the-comment-list').prepend(editRow);
+                        $('#replyrow').fadeIn(300);
                 } else {
-                        $('#edithead, #savebtn', editRow).hide();
+                        $('#edithead, #savebtn, #addhead, #addbtn', editRow).hide();
                         $('#replyhead, #replybtn', editRow).show();
                         c.after(editRow);
                         $('#replyrow').fadeIn(300, function(){ $(this).show() });