Ticket #23322: 23322.4.patch

wp-admin/edit-form-comment.php

@@ -63 +63 @@
 
 <div id="postdiv" class="postarea">
 <?php
-        $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
+        $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
         wp_editor( $comment->comment_content, 'content', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
         wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
 </div>

wp-admin/includes/media.php

@@ -2321 +2321 @@
         <?php endif; ?>
 
         <?php
-                $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
+                $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
                 $editor_args = array(
                         'textarea_name' => 'content',
                         'textarea_rows' => 5,

wp-admin/includes/template.php

@@ -345 +345 @@
 
         <div id="replycontainer">
         <?php
-        $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
+        $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
         wp_editor( '', 'replycontent', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
         ?>
         </div>

wp-includes/class-wp-editor.php

@@ -176 +176 @@
                                 $qtInit = array_merge($qtInit, $set['quicktags']);
 
                         if ( empty($qtInit['buttons']) )
-                                $qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,spell,close';
+                                $qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
 
                         if ( $set['dfw'] )
                                 $qtInit['buttons'] .= ',fullscreen';

wp-includes/js/quicktags.js

@@ -8 +8 @@
  * settings = {
  *   id : 'my_id',          the HTML ID of the textarea, required
  *   buttons: ''            Comma separated list of the names of the default buttons to show. Optional.
- *                          Current list of default button names: 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,spell,close';
+ *                          Current list of default button names: 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
  * }
  *
  * The settings can also be a string quicktags_id.
@@ -229 +229 @@
 
         qt._buttonsInit = function() {
                 var t = this, canvas, name, settings, theButtons, html, inst, ed, id, i, use,
-                        defaults = ',strong,em,link,block,del,ins,img,ul,ol,li,code,more,spell,close,';
+                        defaults = ',strong,em,link,block,del,ins,img,ul,ol,li,code,more,close,';
 
                 for ( inst in t.instances ) {
                         if ( inst == 0 )
@@ -499 +499 @@
                 }
         };
 
-        // the spell button
-        qt.SpellButton = function() {
-                qt.Button.call(this, 'spell', quicktagsL10n.lookup, '', quicktagsL10n.dictionaryLookup);
-        };
-        qt.SpellButton.prototype = new qt.Button();
-        qt.SpellButton.prototype.callback = function(element, canvas, ed) {
-                var word = '', sel, startPos, endPos;
-
-                if ( document.selection ) {
-                        canvas.focus();
-                        sel = document.selection.createRange();
-                        if ( sel.text.length > 0 ) {
-                                word = sel.text;
-                        }
-                } else if ( canvas.selectionStart || canvas.selectionStart == '0' ) {
-                        startPos = canvas.selectionStart;
-                        endPos = canvas.selectionEnd;
-                        if ( startPos != endPos ) {
-                                word = canvas.value.substring(startPos, endPos);
-                        }
-                }
-
-                if ( word === '' ) {
-                        word = prompt(quicktagsL10n.wordLookup, '');
-                }
-
-                if ( word !== null && /^\w[\w ]*$/.test(word)) {
-                        window.open('http://www.answers.com/' + encodeURIComponent(word));
-                }
-        };
-
         // the close tags button
         qt.CloseButton = function() {
                 qt.Button.call(this, 'close', quicktagsL10n.closeTags, '', quicktagsL10n.closeAllOpenTags);
@@ -643 +612 @@
         edButtons[100] = new qt.TagButton('li','li','\t<li>','</li>\n','l'),
         edButtons[110] = new qt.TagButton('code','code','<code>','</code>','c'),
         edButtons[120] = new qt.TagButton('more','more','<!--more-->','','t'),
-        edButtons[130] = new qt.SpellButton(),
         edButtons[140] = new qt.CloseButton()
 
 })();

wp-includes/script-loader.php

@@ -75 +75 @@
 
         $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", array(), false, 1 );
         did_action( 'init' ) && $scripts->localize( 'quicktags', 'quicktagsL10n', array(
-                'wordLookup' => __('Enter a word to look up:'),
-                'dictionaryLookup' => esc_attr(__('Dictionary lookup')),
-                'lookup' => esc_attr(__('lookup')),
                 'closeAllOpenTags' => esc_attr(__('Close all open tags')),
                 'closeTags' => esc_attr(__('close tags')),
                 'enterURL' => __('Enter the URL'),