Ticket #21845: 21845.2.diff

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

@@ -313 +313 @@
         },
 
         toggle : function(el) {
-                if ( $(el).css('display') != 'none' )
-                        $(el).find('a.vim-q').click();
+        var replyrow = $('#replyrow');
+
+                if ( $(el).css('display') != 'none' ) {
+
+            //Open reply box if it is not already open
+            if ( replyrow.parent().is('#com-reply') ) {
+                $(el).find('a.vim-q').click();
+            } else {
+                if ( window.confirm( adminCommentsL10n.warnQuickEdit ) ) {
+                    $(el).find('a.vim-q').click();
+                }
+            }
+        }
         },
 
         revert : function() {

src/wp-includes/script-loader.php

@@ -437 +437 @@
                         'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
                         'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last']),
                         'replyApprove' => __( 'Approve and Reply' ),
-                        'reply' => __( 'Reply' )
+                        'reply' => __( 'Reply' ),
+                        'warnQuickEdit' => __ ( 'Are you sure you want to start quick editing a new comment?' ),
                 ) );
 
                 $scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", array('jquery'), false, 1 );