Changeset 24745

Timestamp:

07/18/2013 10:44:40 PM (11 years ago)

Author:

nacin

Message:

Remove the Spellchecker button from TinyMCE.

It appears Google has finally shut off the old private API it used. Spellcheckers built-in to browsers (and operating systems) seem to be the best alternative.

A WordPress plugin could still re-enable this TinyMCE plugin if they wanted.

props ryanduff for initial patch.
fixes #24789.

File:

• trunk/wp-includes/class-wp-editor.php (modified) (5 diffs)

trunk/wp-includes/class-wp-editor.php

@@ -193 +193 @@
                 self::$mce_locale = $mce_locale = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) ); // only ISO 639-1
                 $no_captions = (bool) apply_filters( 'disable_captions', '' );
-                $plugins = array( 'inlinepopups', 'spellchecker', 'tabfocus', 'paste', 'media', 'fullscreen', 'wordpress', 'wpeditimage', 'wpgallery', 'wplink', 'wpdialogs' );
+                $plugins = array( 'inlinepopups', 'tabfocus', 'paste', 'media', 'fullscreen', 'wordpress', 'wpeditimage', 'wpgallery', 'wplink', 'wpdialogs' );
                 $first_run = true;
                 $ext_plugins = '';
@@ -286 +286 @@
                 self::$ext_plugins = $ext_plugins;
 
-                /*
-                translators: These languages show up in the spellchecker drop-down menu, in the order specified, and with the first
-                language listed being the default language. They must be comma-separated and take the format of name=code, where name
-                is the language name (which you may internationalize), and code is a valid ISO 639 language code. Please test the
-                spellchecker with your values.
-                */
-                $mce_spellchecker_languages = __( 'English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv' );
-
-                /*
-                The following filter allows localization scripts to change the languages displayed in the spellchecker's drop-down menu.
-                By default it uses Google's spellchecker API, but can be configured to use PSpell/ASpell if installed on the server.
-                The + sign marks the default language. More: http://www.tinymce.com/wiki.php/Plugin:spellchecker.
-                */
-                $mce_spellchecker_languages = apply_filters( 'mce_spellchecker_languages', '+' . $mce_spellchecker_languages );
+                if ( in_array( 'spellchecker', $plugins ) ) {
+                    /*
+                    translators: These languages show up in the spellchecker drop-down menu, in the order specified, and with the first
+                    language listed being the default language. They must be comma-separated and take the format of name=code, where name
+                    is the language name (which you may internationalize), and code is a valid ISO 639 language code. Please test the
+                    spellchecker with your values.
+                    */
+                    $mce_spellchecker_languages = __( 'English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv' );
+
+                    /*
+                    The following filter allows localization scripts to change the languages displayed in the spellchecker's drop-down menu.
+                    By default it uses Google's spellchecker API, but can be configured to use PSpell/ASpell if installed on the server.
+                    The + sign marks the default language. More: http://www.tinymce.com/wiki.php/Plugin:spellchecker.
+                    */
+                    $mce_spellchecker_languages = apply_filters( 'mce_spellchecker_languages', '+' . $mce_spellchecker_languages );
+                }
 
                 self::$first_init = array(
@@ -307 +309 @@
                     'skin' => 'wp_theme',
                     'language' => self::$mce_locale,
-                    'spellchecker_languages' => $mce_spellchecker_languages,
                     'theme_advanced_toolbar_location' => 'top',
                     'theme_advanced_toolbar_align' => 'left',
@@ -345 +346 @@
                     'webkit_fake_resize' => false,
                     'preview_styles' => 'font-family font-weight text-decoration text-transform',
-                    'spellchecker_rpc_url' => self::$baseurl . '/plugins/spellchecker/rpc.php',
                     'schema' => 'html5',
                     'wpeditimage_disable_captions' => $no_captions,
@@ -351 +351 @@
                     'plugins' => implode( ',', $plugins )
                 );
+
+                if ( in_array( 'spellchecker', $plugins ) ) {
+                    self::$first_init['spellchecker_rpc_url'] = self::$baseurl . '/plugins/spellchecker/rpc.php';
+                    self::$first_init['spellchecker_languages'] = $mce_spellchecker_languages;
+                }
 
                 // load editor_style.css if the current theme supports it