diff -r 346c88efed21 -r 5e2f62d02dcd wp/wp-includes/class-wp-editor.php
--- a/wp/wp-includes/class-wp-editor.php	Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-includes/class-wp-editor.php	Tue Jun 09 03:35:32 2015 +0200
@@ -24,26 +24,84 @@
 	private static $has_quicktags = false;
 	private static $has_medialib = false;
 	private static $editor_buttons_css = true;
+	private static $drag_drop_upload = false;
 
 	private function __construct() {}
 
-	public static function parse_settings($editor_id, $settings) {
-		$set = wp_parse_args( $settings,  array(
-			'wpautop' => true, // use wpautop?
-			'media_buttons' => true, // show insert/upload button(s)
-			'textarea_name' => $editor_id, // set the textarea name to something different, square brackets [] can be used here
-			'textarea_rows' => 20,
-			'tabindex' => '',
-			'tabfocus_elements' => ':prev,:next', // the previous and next element ID to move the focus to when pressing the Tab key in TinyMCE
-			'editor_css' => '', // intended for extra styles for both visual and Text editors buttons, needs to include the <style> tags, can use "scoped".
-			'editor_class' => '', // add extra class(es) to the editor textarea
-			'teeny' => false, // output the minimal editor config used in Press This
-			'dfw' => false, // replace the default fullscreen with DFW (needs specific DOM elements and css)
-			'tinymce' => true, // load TinyMCE, can be used to pass settings directly to TinyMCE using an array()
-			'quicktags' => true // load Quicktags, can be used to pass settings directly to Quicktags using an array()
+	/**
+	 * Parse default arguments for the editor instance.
+	 *
+	 * @param string $editor_id ID for the current editor instance.
+	 * @param array  $settings {
+	 *     Array of editor arguments.
+	 *
+	 *     @type bool       $wpautop           Whether to use wpautop(). Default true.
+	 *     @type bool       $media_buttons     Whether to show the Add Media/other media buttons.
+	 *     @type string     $default_editor    When both TinyMCE and Quicktags are used, set which
+	 *                                         editor is shown on page load. Default empty.
+	 *     @type bool       $drag_drop_upload  Whether to enable drag & drop on the editor uploading. Default false.
+	 *                                         Requires the media modal.
+	 *     @type string     $textarea_name     Give the textarea a unique name here. Square brackets
+	 *                                         can be used here. Default $editor_id.
+	 *     @type int        $textarea_rows     Number rows in the editor textarea. Default 20.
+	 *     @type string|int $tabindex          Tabindex value to use. Default empty.
+	 *     @type string     $tabfocus_elements The previous and next element ID to move the focus to
+	 *                                         when pressing the Tab key in TinyMCE. Defualt ':prev,:next'.
+	 *     @type string     $editor_css        Intended for extra styles for both Visual and Text editors.
+	 *                                         Should include `<style>` tags, and can use "scoped". Default empty.
+	 *     @type string     $editor_class      Extra classes to add to the editor textarea elemen. Default empty.
+	 *     @type bool       $teeny             Whether to output the minimal editor config. Examples include
+	 *                                         Press This and the Comment editor. Default false.
+	 *     @type bool       $dfw               Whether to replace the default fullscreen with "Distraction Free
+	 *                                         Writing". DFW requires specific DOM elements and css). Default false.
+	 *     @type bool|array $tinymce           Whether to load TinyMCE. Can be used to pass settings directly to
+	 *                                         TinyMCE using an array. Default true.
+	 *     @type bool|array $quicktags         Whether to load Quicktags. Can be used to pass settings directly to
+	 *                                         Quicktags using an array. Default true.
+	 * }
+	 * @return array Parsed arguments array.
+	 */
+	public static function parse_settings( $editor_id, $settings ) {
+
+		/**
+		 * Filter the wp_editor() settings.
+		 *
+		 * @since 4.0.0
+		 *
+		 * @see _WP_Editors()::parse_settings()
+		 *
+		 * @param array  $settings  Array of editor arguments.
+		 * @param string $editor_id ID for the current editor instance.
+		 */
+		$settings = apply_filters( 'wp_editor_settings', $settings, $editor_id );
+
+		$set = wp_parse_args( $settings, array(
+			'wpautop'             => true,
+			'media_buttons'       => true,
+			'default_editor'      => '',
+			'drag_drop_upload'    => false,
+			'textarea_name'       => $editor_id,
+			'textarea_rows'       => 20,
+			'tabindex'            => '',
+			'tabfocus_elements'   => ':prev,:next',
+			'editor_css'          => '',
+			'editor_class'        => '',
+			'teeny'               => false,
+			'dfw'                 => false,
+			'_content_editor_dfw' => false,
+			'tinymce'             => true,
+			'quicktags'           => true
 		) );
 
 		self::$this_tinymce = ( $set['tinymce'] && user_can_richedit() );
+
+		if ( self::$this_tinymce ) {
+			if ( false !== strpos( $editor_id, '[' ) ) {
+				self::$this_tinymce = false;
+				_deprecated_argument( 'wp_editor()', '3.9', 'TinyMCE editor IDs cannot have brackets.' );
+			}
+		}
+
 		self::$this_quicktags = (bool) $set['quicktags'];
 
 		if ( self::$this_tinymce )
@@ -55,16 +113,10 @@
 		if ( empty( $set['editor_height'] ) )
 			return $set;
 
-		if ( 'content' === $editor_id ) {
+		if ( 'content' === $editor_id && empty( $set['tinymce']['wp_autoresize_on'] ) ) {
 			// A cookie (set when a user resizes the editor) overrides the height.
 			$cookie = (int) get_user_setting( 'ed_size' );
 
-			// Upgrade an old TinyMCE cookie if it is still around, and the new one isn't.
-			if ( ! $cookie && isset( $_COOKIE['TinyMCE_content_size'] ) ) {
-				parse_str( $_COOKIE['TinyMCE_content_size'], $cookie );
- 				$cookie = $cookie['ch'];
-			}
-
 			if ( $cookie )
 				$set['editor_height'] = $cookie;
 		}
@@ -86,11 +138,15 @@
 	 */
 	public static function editor( $content, $editor_id, $settings = array() ) {
 
-		$set = self::parse_settings($editor_id, $settings);
+		$set = self::parse_settings( $editor_id, $settings );
 		$editor_class = ' class="' . trim( $set['editor_class'] . ' wp-editor-area' ) . '"';
 		$tabindex = $set['tabindex'] ? ' tabindex="' . (int) $set['tabindex'] . '"' : '';
 		$switch_class = 'html-active';
-		$toolbar = $buttons = '';
+		$toolbar = $buttons = $autocomplete = '';
+
+		if ( $set['drag_drop_upload'] ) {
+			self::$drag_drop_upload = true;
+		}
 
 		if ( ! empty( $set['editor_height'] ) )
 			$height = ' style="height: ' . $set['editor_height'] . 'px"';
@@ -100,22 +156,33 @@
 		if ( !current_user_can( 'upload_files' ) )
 			$set['media_buttons'] = false;
 
-		if ( self::$this_quicktags && self::$this_tinymce ) {
-			$switch_class = 'html-active';
+		if ( ! self::$this_quicktags && self::$this_tinymce ) {
+			$switch_class = 'tmce-active';
+			$autocomplete = ' autocomplete="off"';
+		} elseif ( self::$this_quicktags && self::$this_tinymce ) {
+			$default_editor = $set['default_editor'] ? $set['default_editor'] : wp_default_editor();
+			$autocomplete = ' autocomplete="off"';
 
-			// 'html' and 'switch-html' are used for the "Text" editor tab.
-			if ( 'html' == wp_default_editor() ) {
+			// 'html' is used for the "Text" editor tab.
+			if ( 'html' === $default_editor ) {
 				add_filter('the_editor_content', 'wp_htmledit_pre');
+				$switch_class = 'html-active';
 			} else {
 				add_filter('the_editor_content', 'wp_richedit_pre');
 				$switch_class = 'tmce-active';
 			}
 
-			$buttons .= '<a id="' . $editor_id . '-html" class="wp-switch-editor switch-html" onclick="switchEditors.switchto(this);">' . _x( 'Text', 'Name for the Text editor tab (formerly HTML)' ) . "</a>\n";
-			$buttons .= '<a id="' . $editor_id . '-tmce" class="wp-switch-editor switch-tmce" onclick="switchEditors.switchto(this);">' . __('Visual') . "</a>\n";
+			$buttons .= '<button type="button" id="' . $editor_id . '-tmce" class="wp-switch-editor switch-tmce" onclick="switchEditors.switchto(this);">' . __('Visual') . "</button>\n";
+			$buttons .= '<button type="button" id="' . $editor_id . '-html" class="wp-switch-editor switch-html" onclick="switchEditors.switchto(this);">' . _x( 'Text', 'Name for the Text editor tab (formerly HTML)' ) . "</button>\n";
 		}
 
-		echo '<div id="wp-' . $editor_id . '-wrap" class="wp-core-ui wp-editor-wrap ' . $switch_class . '">';
+		$wrap_class = 'wp-core-ui wp-editor-wrap ' . $switch_class;
+
+		if ( $set['_content_editor_dfw'] ) {
+			$wrap_class .= ' has-dfw';
+		}
+
+		echo '<div id="wp-' . $editor_id . '-wrap" class="' . $wrap_class . '">';
 
 		if ( self::$editor_buttons_css ) {
 			wp_print_styles('editor-buttons');
@@ -127,7 +194,6 @@
 
 		if ( !empty($buttons) || $set['media_buttons'] ) {
 			echo '<div id="wp-' . $editor_id . '-editor-tools" class="wp-editor-tools hide-if-no-js">';
-			echo $buttons;
 
 			if ( $set['media_buttons'] ) {
 				self::$has_medialib = true;
@@ -136,31 +202,62 @@
 					include(ABSPATH . 'wp-admin/includes/media.php');
 
 				echo '<div id="wp-' . $editor_id . '-media-buttons" class="wp-media-buttons">';
-				do_action('media_buttons', $editor_id);
+
+				/**
+				 * Fires after the default media button(s) are displayed.
+				 *
+				 * @since 2.5.0
+				 *
+				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
+				 */
+				do_action( 'media_buttons', $editor_id );
 				echo "</div>\n";
 			}
+
+			echo '<div class="wp-editor-tabs">' . $buttons . "</div>\n";
 			echo "</div>\n";
 		}
 
-		$the_editor = apply_filters('the_editor', '<div id="wp-' . $editor_id . '-editor-container" class="wp-editor-container"><textarea' . $editor_class . $height . $tabindex . ' cols="40" name="' . $set['textarea_name'] . '" id="' . $editor_id . '">%s</textarea></div>');
-		$content = apply_filters('the_editor_content', $content);
+		/**
+		 * Filter the HTML markup output that displays the editor.
+		 *
+		 * @since 2.1.0
+		 *
+		 * @param string $output Editor's HTML markup.
+		 */
+		$the_editor = apply_filters( 'the_editor', '<div id="wp-' . $editor_id . '-editor-container" class="wp-editor-container">' .
+			'<textarea' . $editor_class . $height . $tabindex . $autocomplete . ' cols="40" name="' . $set['textarea_name'] . '" ' .
+			'id="' . $editor_id . '">%s</textarea></div>' );
 
-		printf($the_editor, $content);
+		/**
+		 * Filter the default editor content.
+		 *
+		 * @since 2.1.0
+		 *
+		 * @param string $content Default editor content.
+		 */
+		$content = apply_filters( 'the_editor_content', $content );
+
+		printf( $the_editor, $content );
 		echo "\n</div>\n\n";
 
 		self::editor_settings($editor_id, $set);
 	}
 
+	/**
+	 * @param string $editor_id
+	 * @param array  $set
+	 */
 	public static function editor_settings($editor_id, $set) {
 		$first_run = false;
 
 		if ( empty(self::$first_init) ) {
 			if ( is_admin() ) {
-				add_action( 'admin_print_footer_scripts', array( __CLASS__, 'editor_js'), 50 );
-				add_action( 'admin_footer', array( __CLASS__, 'enqueue_scripts'), 1 );
+				add_action( 'admin_print_footer_scripts', array( __CLASS__, 'editor_js' ), 50 );
+				add_action( 'admin_print_footer_scripts', array( __CLASS__, 'enqueue_scripts' ), 1 );
 			} else {
-				add_action( 'wp_print_footer_scripts', array( __CLASS__, 'editor_js'), 50 );
-				add_action( 'wp_footer', array( __CLASS__, 'enqueue_scripts'), 1 );
+				add_action( 'wp_print_footer_scripts', array( __CLASS__, 'editor_js' ), 50 );
+				add_action( 'wp_print_footer_scripts', array( __CLASS__, 'enqueue_scripts' ), 1 );
 			}
 		}
 
@@ -180,7 +277,20 @@
 			if ( $set['dfw'] )
 				$qtInit['buttons'] .= ',fullscreen';
 
-			$qtInit = apply_filters('quicktags_settings', $qtInit, $editor_id);
+			if ( $set['_content_editor_dfw'] ) {
+				$qtInit['buttons'] .= ',dfw';
+			}
+
+			/**
+			 * Filter the Quicktags settings.
+			 *
+			 * @since 3.3.0
+			 *
+			 * @param array  $qtInit    Quicktags settings.
+			 * @param string $editor_id The unique editor ID, e.g. 'content'.
+			 */
+			$qtInit = apply_filters( 'quicktags_settings', $qtInit, $editor_id );
+
 			self::$qt_settings[$editor_id] = $qtInit;
 
 			self::$qt_buttons = array_merge( self::$qt_buttons, explode(',', $qtInit['buttons']) );
@@ -188,46 +298,115 @@
 
 		if ( self::$this_tinymce ) {
 
-			if ( empty(self::$first_init) ) {
-				self::$baseurl = includes_url('js/tinymce');
-				self::$mce_locale = $mce_locale = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) ); // only ISO 639-1
+			if ( empty( self::$first_init ) ) {
+				self::$baseurl = includes_url( 'js/tinymce' );
+
+				$mce_locale = get_locale();
+				self::$mce_locale = $mce_locale = empty( $mce_locale ) ? 'en' : strtolower( substr( $mce_locale, 0, 2 ) ); // ISO 639-1
+
+				/** This filter is documented in wp-admin/includes/media.php */
 				$no_captions = (bool) apply_filters( 'disable_captions', '' );
-				$plugins = array( 'inlinepopups', 'tabfocus', 'paste', 'media', 'fullscreen', 'wordpress', 'wpeditimage', 'wpgallery', 'wplink', 'wpdialogs' );
 				$first_run = true;
 				$ext_plugins = '';
 
 				if ( $set['teeny'] ) {
-					self::$plugins = $plugins = apply_filters( 'teeny_mce_plugins', array('inlinepopups', 'fullscreen', 'wordpress', 'wplink', 'wpdialogs' ), $editor_id );
+
+					/**
+					 * Filter the list of teenyMCE plugins.
+					 *
+					 * @since 2.7.0
+					 *
+					 * @param array  $plugins   An array of teenyMCE plugins.
+					 * @param string $editor_id Unique editor identifier, e.g. 'content'.
+					 */
+					self::$plugins = $plugins = apply_filters( 'teeny_mce_plugins', array( 'colorpicker', 'lists', 'fullscreen', 'image', 'wordpress', 'wpeditimage', 'wplink' ), $editor_id );
 				} else {
-					/*
-					The following filter takes an associative array of external plugins for TinyMCE in the form 'plugin_name' => 'url'.
-					It adds the plugin's name to TinyMCE's plugins init and the call to PluginManager to load the plugin.
-					The url should be absolute and should include the js file name to be loaded. Example:
-					array( 'myplugin' => 'http://my-site.com/wp-content/plugins/myfolder/mce_plugin.js' )
-					If the plugin uses a button, it should be added with one of the "$mce_buttons" filters.
-					*/
-					$mce_external_plugins = apply_filters('mce_external_plugins', array());
+
+					/**
+					 * Filter the list of TinyMCE external plugins.
+					 *
+					 * The filter takes an associative array of external plugins for
+					 * TinyMCE in the form 'plugin_name' => 'url'.
+					 *
+					 * The url should be absolute, and should include the js filename
+					 * to be loaded. For example:
+					 * 'myplugin' => 'http://mysite.com/wp-content/plugins/myfolder/mce_plugin.js'.
+					 *
+					 * If the external plugin adds a button, it should be added with
+					 * one of the 'mce_buttons' filters.
+					 *
+					 * @since 2.5.0
+					 *
+					 * @param array $external_plugins An array of external TinyMCE plugins.
+					 */
+					$mce_external_plugins = apply_filters( 'mce_external_plugins', array() );
 
-					if ( ! empty($mce_external_plugins) ) {
+					$plugins = array(
+						'charmap',
+						'colorpicker',
+						'hr',
+						'lists',
+						'media',
+						'paste',
+						'tabfocus',
+						'textcolor',
+						'fullscreen',
+						'wordpress',
+						'wpautoresize',
+						'wpeditimage',
+						'wpemoji',
+						'wpgallery',
+						'wplink',
+						'wpdialogs',
+						'wpview',
+					);
+
+					if ( ! self::$has_medialib ) {
+						$plugins[] = 'image';
+					}
 
-						/*
-						The following filter loads external language files for TinyMCE plugins.
-						It takes an associative array 'plugin_name' => 'path', where path is the
-						include path to the file. The language file should follow the same format as
-						/tinymce/langs/wp-langs.php and should define a variable $strings that
-						holds all translated strings.
-						When this filter is not used, the function will try to load {mce_locale}.js.
-						If that is not found, en.js will be tried next.
-						*/
-						$mce_external_languages = apply_filters('mce_external_languages', array());
+					/**
+					 * Filter the list of default TinyMCE plugins.
+					 *
+					 * The filter specifies which of the default plugins included
+					 * in WordPress should be added to the TinyMCE instance.
+					 *
+					 * @since 3.3.0
+					 *
+					 * @param array $plugins An array of default TinyMCE plugins.
+					 */
+					$plugins = array_unique( apply_filters( 'tiny_mce_plugins', $plugins ) );
+
+					if ( ( $key = array_search( 'spellchecker', $plugins ) ) !== false ) {
+						// Remove 'spellchecker' from the internal plugins if added with 'tiny_mce_plugins' filter to prevent errors.
+						// It can be added with 'mce_external_plugins'.
+						unset( $plugins[$key] );
+					}
+
+					if ( ! empty( $mce_external_plugins ) ) {
+
+						/**
+						 * Filter the translations loaded for external TinyMCE 3.x plugins.
+						 *
+						 * The filter takes an associative array ('plugin_name' => 'path')
+						 * where 'path' is the include path to the file.
+						 *
+						 * The language file should follow the same format as wp_mce_translation(),
+						 * and should define a variable ($strings) that holds all translated strings.
+						 *
+						 * @since 2.5.0
+						 *
+						 * @param array $translations Translations for external TinyMCE plugins.
+						 */
+						$mce_external_languages = apply_filters( 'mce_external_languages', array() );
 
 						$loaded_langs = array();
 						$strings = '';
 
-						if ( ! empty($mce_external_languages) ) {
+						if ( ! empty( $mce_external_languages ) ) {
 							foreach ( $mce_external_languages as $name => $path ) {
-								if ( @is_file($path) && @is_readable($path) ) {
-									include_once($path);
+								if ( @is_file( $path ) && @is_readable( $path ) ) {
+									include_once( $path );
 									$ext_plugins .= $strings . "\n";
 									$loaded_langs[] = $name;
 								}
@@ -235,39 +414,43 @@
 						}
 
 						foreach ( $mce_external_plugins as $name => $url ) {
+							if ( in_array( $name, $plugins, true ) ) {
+								unset( $mce_external_plugins[ $name ] );
+								continue;
+							}
 
 							$url = set_url_scheme( $url );
-
-							$plugins[] = '-' . $name;
+							$mce_external_plugins[ $name ] = $url;
+							$plugurl = dirname( $url );
+							$strings = '';
 
-							$plugurl = dirname($url);
-							$strings = $str1 = $str2 = '';
-							if ( ! in_array($name, $loaded_langs) ) {
+							// Try to load langs/[locale].js and langs/[locale]_dlg.js
+							if ( ! in_array( $name, $loaded_langs, true ) ) {
 								$path = str_replace( content_url(), '', $plugurl );
 								$path = WP_CONTENT_DIR . $path . '/langs/';
 
 								if ( function_exists('realpath') )
 									$path = trailingslashit( realpath($path) );
 
-								if ( @is_file($path . $mce_locale . '.js') )
-									$strings .= @file_get_contents($path . $mce_locale . '.js') . "\n";
+								if ( @is_file( $path . $mce_locale . '.js' ) )
+									$strings .= @file_get_contents( $path . $mce_locale . '.js' ) . "\n";
 
-								if ( @is_file($path . $mce_locale . '_dlg.js') )
-									$strings .= @file_get_contents($path . $mce_locale . '_dlg.js') . "\n";
+								if ( @is_file( $path . $mce_locale . '_dlg.js' ) )
+									$strings .= @file_get_contents( $path . $mce_locale . '_dlg.js' ) . "\n";
 
-								if ( 'en' != $mce_locale && empty($strings) ) {
-									if ( @is_file($path . 'en.js') ) {
-										$str1 = @file_get_contents($path . 'en.js');
+								if ( 'en' != $mce_locale && empty( $strings ) ) {
+									if ( @is_file( $path . 'en.js' ) ) {
+										$str1 = @file_get_contents( $path . 'en.js' );
 										$strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str1, 1 ) . "\n";
 									}
 
-									if ( @is_file($path . 'en_dlg.js') ) {
-										$str2 = @file_get_contents($path . 'en_dlg.js');
+									if ( @is_file( $path . 'en_dlg.js' ) ) {
+										$str2 = @file_get_contents( $path . 'en_dlg.js' );
 										$strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str2, 1 ) . "\n";
 									}
 								}
 
-								if ( ! empty($strings) )
+								if ( ! empty( $strings ) )
 									$ext_plugins .= "\n" . $strings . "\n";
 							}
 
@@ -275,8 +458,6 @@
 							$ext_plugins .= 'tinymce.PluginManager.load("' . $name . '", "' . $url . '");' . "\n";
 						}
 					}
-
-					$plugins = array_unique( apply_filters('tiny_mce_plugins', $plugins) );
 				}
 
 				if ( $set['dfw'] )
@@ -285,129 +466,146 @@
 				self::$plugins = $plugins;
 				self::$ext_plugins = $ext_plugins;
 
-				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(
-					'mode' => 'exact',
-					'width' => '100%',
-					'theme' => 'advanced',
-					'skin' => 'wp_theme',
+					'theme' => 'modern',
+					'skin' => 'lightgray',
 					'language' => self::$mce_locale,
-					'theme_advanced_toolbar_location' => 'top',
-					'theme_advanced_toolbar_align' => 'left',
-					'theme_advanced_statusbar_location' => 'bottom',
-					'theme_advanced_resizing' => true,
-					'theme_advanced_resize_horizontal' => false,
-					'dialog_type' => 'modal',
 					'formats' => "{
-						alignleft : [
-							{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'left'}},
-							{selector : 'img,table', classes : 'alignleft'}
+						alignleft: [
+							{selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles: {textAlign:'left'}},
+							{selector: 'img,table,dl.wp-caption', classes: 'alignleft'}
 						],
-						aligncenter : [
-							{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'center'}},
-							{selector : 'img,table', classes : 'aligncenter'}
+						aligncenter: [
+							{selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles: {textAlign:'center'}},
+							{selector: 'img,table,dl.wp-caption', classes: 'aligncenter'}
 						],
-						alignright : [
-							{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'right'}},
-							{selector : 'img,table', classes : 'alignright'}
+						alignright: [
+							{selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles: {textAlign:'right'}},
+							{selector: 'img,table,dl.wp-caption', classes: 'alignright'}
 						],
-						strikethrough : {inline : 'del'}
+						strikethrough: {inline: 'del'}
 					}",
 					'relative_urls' => false,
 					'remove_script_host' => false,
 					'convert_urls' => false,
-					'remove_linebreaks' => true,
-					'gecko_spellcheck' => true,
+					'browser_spellcheck' => true,
 					'fix_list_elements' => true,
-					'keep_styles' => false,
 					'entities' => '38,amp,60,lt,62,gt',
-					'accessibility_focus' => true,
-					'media_strict' => false,
-					'paste_remove_styles' => true,
-					'paste_remove_spans' => true,
-					'paste_strip_class_attributes' => 'all',
-					'paste_text_use_dialog' => true,
-					'webkit_fake_resize' => false,
-					'preview_styles' => 'font-family font-weight text-decoration text-transform',
-					'schema' => 'html5',
+					'entity_encoding' => 'raw',
+					'keep_styles' => false,
+					'cache_suffix' => 'wp-mce-' . $GLOBALS['tinymce_version'],
+
+					// Limit the preview styles in the menu/toolbar
+					'preview_styles' => 'font-family font-size font-weight font-style text-decoration text-transform',
+
+					'end_container_on_empty_block' => true,
 					'wpeditimage_disable_captions' => $no_captions,
-					'wp_fullscreen_content_css' => self::$baseurl . '/plugins/wpfullscreen/css/wp-fullscreen.css',
-					'plugins' => implode( ',', $plugins )
+					'wpeditimage_html5_captions' => current_theme_supports( 'html5', 'caption' ),
+					'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;
+				if ( ! empty( $mce_external_plugins ) ) {
+					self::$first_init['external_plugins'] = wp_json_encode( $mce_external_plugins );
 				}
 
-				// load editor_style.css if the current theme supports it
-				if ( ! empty( $GLOBALS['editor_styles'] ) && is_array( $GLOBALS['editor_styles'] ) ) {
-					$editor_styles = $GLOBALS['editor_styles'];
-
-					$mce_css = array();
-					$editor_styles = array_unique( array_filter( $editor_styles ) );
-					$style_uri = get_stylesheet_directory_uri();
-					$style_dir = get_stylesheet_directory();
-
-					// Support externally referenced styles (like, say, fonts).
-					foreach ( $editor_styles as $key => $file ) {
-						if ( preg_match( '~^(https?:)?//~', $file ) ) {
-							$mce_css[] = esc_url_raw( $file );
-							unset( $editor_styles[ $key ] );
-						}
-					}
+				$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+				$version = 'ver=' . $GLOBALS['wp_version'];
+				$dashicons = includes_url( "css/dashicons$suffix.css?$version" );
 
-					// Look in a parent theme first, that way child theme CSS overrides.
-					if ( is_child_theme() ) {
-						$template_uri = get_template_directory_uri();
-						$template_dir = get_template_directory();
+				// WordPress default stylesheet and dashicons
+				$mce_css = array(
+					$dashicons,
+					self::$baseurl . '/skins/wordpress/wp-content.css?' . $version
+				);
 
-						foreach ( $editor_styles as $key => $file ) {
-							if ( $file && file_exists( "$template_dir/$file" ) )
-								$mce_css[] = "$template_uri/$file";
-						}
+				$editor_styles = get_editor_stylesheets();
+				if ( ! empty( $editor_styles ) ) {
+					foreach ( $editor_styles as $style ) {
+						$mce_css[] = $style;
 					}
-
-					foreach ( $editor_styles as $file ) {
-						if ( $file && file_exists( "$style_dir/$file" ) )
-							$mce_css[] = "$style_uri/$file";
-					}
-
-					$mce_css = implode( ',', $mce_css );
-				} else {
-					$mce_css = '';
 				}
 
-				$mce_css = trim( apply_filters( 'mce_css', $mce_css ), ' ,' );
+				/**
+				 * Filter the comma-delimited list of stylesheets to load in TinyMCE.
+				 *
+				 * @since 2.1.0
+				 *
+				 * @param array $stylesheets Comma-delimited list of stylesheets.
+				 */
+				$mce_css = trim( apply_filters( 'mce_css', implode( ',', $mce_css ) ), ' ,' );
 
 				if ( ! empty($mce_css) )
 					self::$first_init['content_css'] = $mce_css;
 			}
 
 			if ( $set['teeny'] ) {
-				$mce_buttons = apply_filters( 'teeny_mce_buttons', array('bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'justifyleft', 'justifycenter', 'justifyright', 'undo', 'redo', 'link', 'unlink', 'fullscreen'), $editor_id );
+
+				/**
+				 * Filter the list of teenyMCE buttons (Text tab).
+				 *
+				 * @since 2.7.0
+				 *
+				 * @param array  $buttons   An array of teenyMCE buttons.
+				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
+				 */
+				$mce_buttons = apply_filters( 'teeny_mce_buttons', array('bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'alignleft', 'aligncenter', 'alignright', 'undo', 'redo', 'link', 'unlink', 'fullscreen'), $editor_id );
 				$mce_buttons_2 = $mce_buttons_3 = $mce_buttons_4 = array();
 			} else {
-				$mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'justifyleft', 'justifycenter', 'justifyright', 'link', 'unlink', 'wp_more', 'spellchecker', 'fullscreen', 'wp_adv' ), $editor_id);
-				$mce_buttons_2 = apply_filters('mce_buttons_2', array( 'formatselect', 'underline', 'justifyfull', 'forecolor', 'pastetext', 'pasteword', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo', 'wp_help' ), $editor_id);
-				$mce_buttons_3 = apply_filters('mce_buttons_3', array(), $editor_id);
-				$mce_buttons_4 = apply_filters('mce_buttons_4', array(), $editor_id);
+				$mce_buttons = array( 'bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'hr', 'alignleft', 'aligncenter', 'alignright', 'link', 'unlink', 'wp_more', 'spellchecker' );
+
+				if ( $set['_content_editor_dfw'] ) {
+					$mce_buttons[] = 'dfw';
+				} else {
+					$mce_buttons[] = 'fullscreen';
+				}
+
+				$mce_buttons[] = 'wp_adv';
+
+				/**
+				 * Filter the first-row list of TinyMCE buttons (Visual tab).
+				 *
+				 * @since 2.0.0
+				 *
+				 * @param array  $buttons   First-row list of buttons.
+				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
+				 */
+				$mce_buttons = apply_filters( 'mce_buttons', $mce_buttons, $editor_id );
+
+				$mce_buttons_2 = array( 'formatselect', 'underline', 'alignjustify', 'forecolor', 'pastetext', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo' );
+
+				if ( ! wp_is_mobile() ) {
+					$mce_buttons_2[] = 'wp_help';
+				}
+
+				/**
+				 * Filter the second-row list of TinyMCE buttons (Visual tab).
+				 *
+				 * @since 2.0.0
+				 *
+				 * @param array  $buttons   Second-row list of buttons.
+				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
+				 */
+				$mce_buttons_2 = apply_filters( 'mce_buttons_2', $mce_buttons_2, $editor_id );
+
+				/**
+				 * Filter the third-row list of TinyMCE buttons (Visual tab).
+				 *
+				 * @since 2.0.0
+				 *
+				 * @param array  $buttons   Third-row list of buttons.
+				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
+				 */
+				$mce_buttons_3 = apply_filters( 'mce_buttons_3', array(), $editor_id );
+
+				/**
+				 * Filter the fourth-row list of TinyMCE buttons (Visual tab).
+				 *
+				 * @since 2.5.0
+				 *
+				 * @param array  $buttons   Fourth-row list of buttons.
+				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
+				 */
+				$mce_buttons_4 = apply_filters( 'mce_buttons_4', array(), $editor_id );
 			}
 
 			$body_class = $editor_id;
@@ -423,6 +621,8 @@
 				}
 			}
 
+			$body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+
 			if ( !empty($set['tinymce']['body_class']) ) {
 				$body_class .= ' ' . $set['tinymce']['body_class'];
 				unset($set['tinymce']['body_class']);
@@ -441,40 +641,60 @@
 			}
 
 			$mceInit = array (
-				'elements' => $editor_id,
+				'selector' => "#$editor_id",
+				'resize' => 'vertical',
+				'menubar' => false,
 				'wpautop' => (bool) $set['wpautop'],
-				'remove_linebreaks' => (bool) $set['wpautop'],
-				'apply_source_formatting' => (bool) !$set['wpautop'],
-				'theme_advanced_buttons1' => implode($mce_buttons, ','),
-				'theme_advanced_buttons2' => implode($mce_buttons_2, ','),
-				'theme_advanced_buttons3' => implode($mce_buttons_3, ','),
-				'theme_advanced_buttons4' => implode($mce_buttons_4, ','),
+				'indent' => ! $set['wpautop'],
+				'toolbar1' => implode($mce_buttons, ','),
+				'toolbar2' => implode($mce_buttons_2, ','),
+				'toolbar3' => implode($mce_buttons_3, ','),
+				'toolbar4' => implode($mce_buttons_4, ','),
 				'tabfocus_elements' => $set['tabfocus_elements'],
 				'body_class' => $body_class
 			);
 
-			// The main editor doesn't use the TinyMCE resizing cookie.
-			$mceInit['theme_advanced_resizing_use_cookie'] = 'content' !== $editor_id || empty( $set['editor_height'] );
+			if ( $first_run )
+				$mceInit = array_merge( self::$first_init, $mceInit );
+
+			if ( is_array( $set['tinymce'] ) )
+				$mceInit = array_merge( $mceInit, $set['tinymce'] );
 
-			if ( $first_run )
-				$mceInit = array_merge(self::$first_init, $mceInit);
-
-			if ( is_array($set['tinymce']) )
-				$mceInit = array_merge($mceInit, $set['tinymce']);
+			/*
+			 * For people who really REALLY know what they're doing with TinyMCE
+			 * You can modify $mceInit to add, remove, change elements of the config
+			 * before tinyMCE.init. Setting "valid_elements", "invalid_elements"
+			 * and "extended_valid_elements" can be done through this filter. Best
+			 * is to use the default cleanup by not specifying valid_elements,
+			 * as TinyMCE contains full set of XHTML 1.0.
+			 */
+			if ( $set['teeny'] ) {
 
-			// For people who really REALLY know what they're doing with TinyMCE
-			// You can modify $mceInit to add, remove, change elements of the config before tinyMCE.init
-			// Setting "valid_elements", "invalid_elements" and "extended_valid_elements" can be done through this filter.
-			// Best is to use the default cleanup by not specifying valid_elements, as TinyMCE contains full set of XHTML 1.0.
-			if ( $set['teeny'] ) {
-				$mceInit = apply_filters('teeny_mce_before_init', $mceInit, $editor_id);
+				/**
+				 * Filter the teenyMCE config before init.
+				 *
+				 * @since 2.7.0
+				 *
+				 * @param array  $mceInit   An array with teenyMCE config.
+				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
+				 */
+				$mceInit = apply_filters( 'teeny_mce_before_init', $mceInit, $editor_id );
 			} else {
-				$mceInit = apply_filters('tiny_mce_before_init', $mceInit, $editor_id);
+
+				/**
+				 * Filter the TinyMCE config before init.
+				 *
+				 * @since 2.5.0
+				 *
+				 * @param array  $mceInit   An array with TinyMCE config.
+				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
+				 */
+				$mceInit = apply_filters( 'tiny_mce_before_init', $mceInit, $editor_id );
 			}
 
-			if ( empty($mceInit['theme_advanced_buttons3']) && !empty($mceInit['theme_advanced_buttons4']) ) {
-				$mceInit['theme_advanced_buttons3'] = $mceInit['theme_advanced_buttons4'];
-				$mceInit['theme_advanced_buttons4'] = '';
+			if ( empty( $mceInit['toolbar3'] ) && ! empty( $mceInit['toolbar4'] ) ) {
+				$mceInit['toolbar3'] = $mceInit['toolbar4'];
+				$mceInit['toolbar4'] = '';
 			}
 
 			self::$mce_settings[$editor_id] = $mceInit;
@@ -505,13 +725,13 @@
 		if ( self::$has_tinymce )
 			wp_enqueue_script('editor');
 
-		if ( self::$has_quicktags )
-			wp_enqueue_script('quicktags');
+		if ( self::$has_quicktags ) {
+			wp_enqueue_script( 'quicktags' );
+			wp_enqueue_style( 'buttons' );
+		}
 
 		if ( in_array('wplink', self::$plugins, true) || in_array('link', self::$qt_buttons, true) ) {
 			wp_enqueue_script('wplink');
-			wp_enqueue_script('wpdialogs-popup');
-			wp_enqueue_style('wp-jquery-ui-dialog');
 		}
 
 		if ( in_array('wpfullscreen', self::$plugins, true) || in_array('fullscreen', self::$qt_buttons, true) )
@@ -521,6 +741,309 @@
 			add_thickbox();
 			wp_enqueue_script('media-upload');
 		}
+
+		/**
+		 * Fires when scripts and styles are enqueued for the editor.
+		 *
+		 * @since 3.9.0
+		 *
+		 * @param array $to_load An array containing boolean values whether TinyMCE
+		 *                       and Quicktags are being loaded.
+		 */
+		do_action( 'wp_enqueue_editor', array(
+			'tinymce'   => self::$has_tinymce,
+			'quicktags' => self::$has_quicktags,
+		) );
+	}
+
+	/**
+	 * Translates the default TinyMCE strings and returns them as JSON encoded object ready to be loaded with tinymce.addI18n().
+	 * Can be used directly (_WP_Editors::wp_mce_translation()) by passing the same locale as set in the TinyMCE init object.
+	 *
+	 * @param string $mce_locale The locale used for the editor.
+	 * @param bool $json_only optional Whether to include the JavaScript calls to tinymce.addI18n() and tinymce.ScriptLoader.markDone().
+	 * @return string Translation object, JSON encoded.
+	 */
+	public static function wp_mce_translation( $mce_locale = '', $json_only = false ) {
+
+		$mce_translation = array(
+			// Default TinyMCE strings
+			'New document' => __( 'New document' ),
+			'Formats' => _x( 'Formats', 'TinyMCE' ),
+
+			'Headings' => _x( 'Headings', 'TinyMCE' ),
+			'Heading 1' => __( 'Heading 1' ),
+			'Heading 2' => __( 'Heading 2' ),
+			'Heading 3' => __( 'Heading 3' ),
+			'Heading 4' => __( 'Heading 4' ),
+			'Heading 5' => __( 'Heading 5' ),
+			'Heading 6' => __( 'Heading 6' ),
+
+			/* translators: block tags */
+			'Blocks' => _x( 'Blocks', 'TinyMCE' ),
+			'Paragraph' => __( 'Paragraph' ),
+			'Blockquote' => __( 'Blockquote' ),
+			'Div' => _x( 'Div', 'HTML tag' ),
+			'Pre' => _x( 'Pre', 'HTML tag' ),
+			'Address' => _x( 'Address', 'HTML tag' ),
+
+			'Inline' => _x( 'Inline', 'HTML elements' ),
+			'Underline' => __( 'Underline' ),
+			'Strikethrough' => __( 'Strikethrough' ),
+			'Subscript' => __( 'Subscript' ),
+			'Superscript' => __( 'Superscript' ),
+			'Clear formatting' => __( 'Clear formatting' ),
+			'Bold' => __( 'Bold' ),
+			'Italic' => __( 'Italic' ),
+			'Code' => _x( 'Code', 'editor button' ),
+			'Source code' => __( 'Source code' ),
+			'Font Family' => __( 'Font Family' ),
+			'Font Sizes' => __( 'Font Sizes' ),
+
+			'Align center' => __( 'Align center' ),
+			'Align right' => __( 'Align right' ),
+			'Align left' => __( 'Align left' ),
+			'Justify' => __( 'Justify' ),
+			'Increase indent' => __( 'Increase indent' ),
+			'Decrease indent' => __( 'Decrease indent' ),
+
+			'Cut' => __( 'Cut' ),
+			'Copy' => __( 'Copy' ),
+			'Paste' => __( 'Paste' ),
+			'Select all' => __( 'Select all' ),
+			'Undo' => __( 'Undo' ),
+			'Redo' => __( 'Redo' ),
+
+			'Ok' => __( 'OK' ),
+			'Cancel' => __( 'Cancel' ),
+			'Close' => __( 'Close' ),
+			'Visual aids' => __( 'Visual aids' ),
+
+			'Bullet list' => __( 'Bulleted list' ),
+			'Numbered list' => __( 'Numbered list' ),
+			'Square' => _x( 'Square', 'list style' ),
+			'Default' => _x( 'Default', 'list style' ),
+			'Circle' => _x( 'Circle', 'list style' ),
+			'Disc' => _x('Disc', 'list style' ),
+			'Lower Greek' => _x( 'Lower Greek', 'list style' ),
+			'Lower Alpha' => _x( 'Lower Alpha', 'list style' ),
+			'Upper Alpha' => _x( 'Upper Alpha', 'list style' ),
+			'Upper Roman' => _x( 'Upper Roman', 'list style' ),
+			'Lower Roman' => _x( 'Lower Roman', 'list style' ),
+
+			// Anchor plugin
+			'Name' => _x( 'Name', 'Name of link anchor (TinyMCE)' ),
+			'Anchor' => _x( 'Anchor', 'Link anchor (TinyMCE)' ),
+			'Anchors' => _x( 'Anchors', 'Link anchors (TinyMCE)' ),
+
+			// Fullpage plugin
+			'Document properties' => __( 'Document properties' ),
+			'Robots' => __( 'Robots' ),
+			'Title' => __( 'Title' ),
+			'Keywords' => __( 'Keywords' ),
+			'Encoding' => __( 'Encoding' ),
+			'Description' => __( 'Description' ),
+			'Author' => __( 'Author' ),
+
+			// Media, image plugins
+			'Insert/edit image' => __( 'Insert/edit image' ),
+			'General' => __( 'General' ),
+			'Advanced' => __( 'Advanced' ),
+			'Source' => __( 'Source' ),
+			'Border' => __( 'Border' ),
+			'Constrain proportions' => __( 'Constrain proportions' ),
+			'Vertical space' => __( 'Vertical space' ),
+			'Image description' => __( 'Image description' ),
+			'Style' => __( 'Style' ),
+			'Dimensions' => __( 'Dimensions' ),
+			'Insert image' => __( 'Insert image' ),
+			'Insert date/time' => __( 'Insert date/time' ),
+			'Insert/edit video' => __( 'Insert/edit video' ),
+			'Poster' => __( 'Poster' ),
+			'Alternative source' => __( 'Alternative source' ),
+			'Paste your embed code below:' => __( 'Paste your embed code below:' ),
+			'Insert video' => __( 'Insert video' ),
+			'Embed' => __( 'Embed' ),
+
+			// Each of these have a corresponding plugin
+			'Special character' => __( 'Special character' ),
+			'Right to left' => _x( 'Right to left', 'editor button' ),
+			'Left to right' => _x( 'Left to right', 'editor button' ),
+			'Emoticons' => __( 'Emoticons' ),
+			'Nonbreaking space' => __( 'Nonbreaking space' ),
+			'Page break' => __( 'Page break' ),
+			'Paste as text' => __( 'Paste as text' ),
+			'Preview' => __( 'Preview' ),
+			'Print' => __( 'Print' ),
+			'Save' => __( 'Save' ),
+			'Fullscreen' => __( 'Fullscreen' ),
+			'Horizontal line' => __( 'Horizontal line' ),
+			'Horizontal space' => __( 'Horizontal space' ),
+			'Restore last draft' => __( 'Restore last draft' ),
+			'Insert/edit link' => __( 'Insert/edit link' ),
+			'Remove link' => __( 'Remove link' ),
+
+			'Color' => __( 'Color' ),
+			'Custom color' => __( 'Custom color' ),
+			'Custom...' => _x( 'Custom...', 'label for custom color' ),
+			'No color' => __( 'No color' ),
+
+			// Spelling, search/replace plugins
+			'Could not find the specified string.' => __( 'Could not find the specified string.' ),
+			'Replace' => _x( 'Replace', 'find/replace' ),
+			'Next' => _x( 'Next', 'find/replace' ),
+			/* translators: previous */
+			'Prev' => _x( 'Prev', 'find/replace' ),
+			'Whole words' => _x( 'Whole words', 'find/replace' ),
+			'Find and replace' => __( 'Find and replace' ),
+			'Replace with' => _x('Replace with', 'find/replace' ),
+			'Find' => _x( 'Find', 'find/replace' ),
+			'Replace all' => _x( 'Replace all', 'find/replace' ),
+			'Match case' => __( 'Match case' ),
+			'Spellcheck' => __( 'Check Spelling' ),
+			'Finish' => _x( 'Finish', 'spellcheck' ),
+			'Ignore all' => _x( 'Ignore all', 'spellcheck' ),
+			'Ignore' => _x( 'Ignore', 'spellcheck' ),
+			'Add to Dictionary' => __( 'Add to Dictionary' ),
+
+			// TinyMCE tables
+			'Insert table' => __( 'Insert table' ),
+			'Delete table' => __( 'Delete table' ),
+			'Table properties' => __( 'Table properties' ),
+			'Row properties' => __( 'Table row properties' ),
+			'Cell properties' => __( 'Table cell properties' ),
+			'Border color' => __( 'Border color' ),
+
+			'Row' => __( 'Row' ),
+			'Rows' => __( 'Rows' ),
+			'Column' => _x( 'Column', 'table column' ),
+			'Cols' => _x( 'Cols', 'table columns' ),
+			'Cell' => _x( 'Cell', 'table cell' ),
+			'Header cell' => __( 'Header cell' ),
+			'Header' => _x( 'Header', 'table header' ),
+			'Body' => _x( 'Body', 'table body' ),
+			'Footer' => _x( 'Footer', 'table footer' ),
+
+			'Insert row before' => __( 'Insert row before' ),
+			'Insert row after' => __( 'Insert row after' ),
+			'Insert column before' => __( 'Insert column before' ),
+			'Insert column after' => __( 'Insert column after' ),
+			'Paste row before' => __( 'Paste table row before' ),
+			'Paste row after' => __( 'Paste table row after' ),
+			'Delete row' => __( 'Delete row' ),
+			'Delete column' => __( 'Delete column' ),
+			'Cut row' => __( 'Cut table row' ),
+			'Copy row' => __( 'Copy table row' ),
+			'Merge cells' => __( 'Merge table cells' ),
+			'Split cell' => __( 'Split table cell' ),
+
+			'Height' => __( 'Height' ),
+			'Width' => __( 'Width' ),
+			'Caption' => __( 'Caption' ),
+			'Alignment' => __( 'Alignment' ),
+			'H Align' => _x( 'H Align', 'horizontal table cell alignment' ),
+			'Left' => __( 'Left' ),
+			'Center' => __( 'Center' ),
+			'Right' => __( 'Right' ),
+			'None' => _x( 'None', 'table cell alignment attribute' ),
+			'V Align' => _x( 'V Align', 'vertical table cell alignment' ),
+			'Top' => __( 'Top' ),
+			'Middle' => __( 'Middle' ),
+			'Bottom' => __( 'Bottom' ),
+
+			'Row group' => __( 'Row group' ),
+			'Column group' => __( 'Column group' ),
+			'Row type' => __( 'Row type' ),
+			'Cell type' => __( 'Cell type' ),
+			'Cell padding' => __( 'Cell padding' ),
+			'Cell spacing' => __( 'Cell spacing' ),
+			'Scope' => _x( 'Scope', 'table cell scope attribute' ),
+
+			'Insert template' => _x( 'Insert template', 'TinyMCE' ),
+			'Templates' => _x( 'Templates', 'TinyMCE' ),
+
+			'Background color' => __( 'Background color' ),
+			'Text color' => __( 'Text color' ),
+			'Show blocks' => _x( 'Show blocks', 'editor button' ),
+			'Show invisible characters' => __( 'Show invisible characters' ),
+
+			/* translators: word count */
+			'Words: {0}' => sprintf( __( 'Words: %s' ), '{0}' ),
+			'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' => __( 'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' ) . "\n\n" . __( 'If you&#8217;re looking to paste rich content from Microsoft Word, try turning this option off. The editor will clean up text pasted from Word automatically.' ),
+			'Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help' => __( 'Rich Text Area. Press Alt-Shift-H for help' ),
+			'You have unsaved changes are you sure you want to navigate away?' => __( 'The changes you made will be lost if you navigate away from this page.' ),
+			'Your browser doesn\'t support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.' => __( 'Your browser does not support direct access to the clipboard. Please use keyboard shortcuts or your browser&#8217;s edit menu instead.' ),
+
+			// TinyMCE menus
+			'Insert' => _x( 'Insert', 'TinyMCE menu' ),
+			'File' => _x( 'File', 'TinyMCE menu' ),
+			'Edit' => _x( 'Edit', 'TinyMCE menu' ),
+			'Tools' => _x( 'Tools', 'TinyMCE menu' ),
+			'View' => _x( 'View', 'TinyMCE menu' ),
+			'Table' => _x( 'Table', 'TinyMCE menu' ),
+			'Format' => _x( 'Format', 'TinyMCE menu' ),
+
+			// WordPress strings
+			'Keyboard Shortcuts' => __( 'Keyboard Shortcuts' ),
+			'Toolbar Toggle' => __( 'Toolbar Toggle' ),
+			'Insert Read More tag' => __( 'Insert Read More tag' ),
+			'Read more...' => __( 'Read more...' ), // Title on the placeholder inside the editor
+			'Distraction-free writing mode' => __( 'Distraction-free writing mode' ),
+			'No alignment' => __( 'No alignment' ), // Tooltip for the 'alignnone' button in the image toolbar
+			'Remove' => __( 'Remove' ), // Tooltip for the 'remove' button in the image toolbar
+			'Edit ' => __( 'Edit' ), // Tooltip for the 'edit' button in the image toolbar
+		);
+
+		/**
+		 * Link plugin (not included):
+		 *	Insert link
+		 *	Target
+		 *	New window
+		 *	Text to display
+		 *	The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?
+		 *	The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?
+		 *	Url
+		 */
+
+		if ( ! $mce_locale ) {
+			$mce_locale = self::$mce_locale;
+		}
+
+		/**
+		 * Filter translated strings prepared for TinyMCE.
+		 *
+		 * @since 3.9.0
+		 *
+		 * @param array  $mce_translation Key/value pairs of strings.
+		 * @param string $mce_locale      Locale.
+		 */
+		$mce_translation = apply_filters( 'wp_mce_translation', $mce_translation, $mce_locale );
+
+		foreach ( $mce_translation as $key => $value ) {
+			// Remove strings that are not translated.
+			if ( $key === $value ) {
+				unset( $mce_translation[$key] );
+				continue;
+			}
+
+			if ( false !== strpos( $value, '&' ) ) {
+				$mce_translation[$key] = html_entity_decode( $value, ENT_QUOTES, 'UTF-8' );
+			}
+		}
+
+		// Set direction
+		if ( is_rtl() ) {
+			$mce_translation['_dir'] = 'rtl';
+		}
+
+		if ( $json_only ) {
+			return wp_json_encode( $mce_translation );
+		}
+
+		$baseurl = self::$baseurl ? self::$baseurl : includes_url( 'js/tinymce' );
+
+		return "tinymce.addI18n( '$mce_locale', " . wp_json_encode( $mce_translation ) . ");\n" .
+			"tinymce.ScriptLoader.markDone( '$baseurl/langs/$mce_locale.js' );\n";
 	}
 
 	public static function editor_js() {
@@ -542,9 +1065,6 @@
 		$compressed = $compress_scripts && $concatenate_scripts && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
 			&& false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
 
-		if ( $tmce_on && 'en' != self::$mce_locale )
-			include_once(ABSPATH . WPINC . '/js/tinymce/langs/wp-langs.php');
-
 		$mceInit = $qtInit = '';
 		if ( $tmce_on ) {
 			foreach ( self::$mce_settings as $editor_id => $init ) {
@@ -568,194 +1088,236 @@
 
 		$ref = array(
 			'plugins' => implode( ',', self::$plugins ),
-			'theme' => 'advanced',
+			'theme' => 'modern',
 			'language' => self::$mce_locale
 		);
 
-		$suffix = ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) ? '_src' : '';
+		$suffix = ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) ? '' : '.min';
 
-		do_action('before_wp_tiny_mce', self::$mce_settings);
-?>
+		/**
+		 * Fires immediately before the TinyMCE settings are printed.
+		 *
+		 * @since 3.2.0
+		 *
+		 * @param array $mce_settings TinyMCE settings array.
+		 */
+		do_action( 'before_wp_tiny_mce', self::$mce_settings );
+		?>
 
-	<script type="text/javascript">
+		<script type="text/javascript">
 		tinyMCEPreInit = {
-			base : "<?php echo self::$baseurl; ?>",
-			suffix : "<?php echo $suffix; ?>",
-			query : "<?php echo $version; ?>",
-			mceInit : <?php echo $mceInit; ?>,
-			qtInit : <?php echo $qtInit; ?>,
-			ref : <?php echo self::_parse_init( $ref ); ?>,
-			load_ext : function(url,lang){var sl=tinymce.ScriptLoader;sl.markDone(url+'/langs/'+lang+'.js');sl.markDone(url+'/langs/'+lang+'_dlg.js');}
+			baseURL: "<?php echo self::$baseurl; ?>",
+			suffix: "<?php echo $suffix; ?>",
+			<?php
+
+			if ( self::$drag_drop_upload ) {
+				echo 'dragDropUpload: true,';
+			}
+
+			?>
+			mceInit: <?php echo $mceInit; ?>,
+			qtInit: <?php echo $qtInit; ?>,
+			ref: <?php echo self::_parse_init( $ref ); ?>,
+			load_ext: function(url,lang){var sl=tinymce.ScriptLoader;sl.markDone(url+'/langs/'+lang+'.js');sl.markDone(url+'/langs/'+lang+'_dlg.js');}
 		};
-	</script>
-<?php
+		</script>
+		<?php
 
 		$baseurl = self::$baseurl;
+		// Load tinymce.js when running from /src, else load wp-tinymce.js.gz (production) or tinymce.min.js (SCRIPT_DEBUG)
+		$mce_suffix = false !== strpos( $GLOBALS['wp_version'], '-src' ) ? '' : '.min';
 
 		if ( $tmce_on ) {
 			if ( $compressed ) {
 				echo "<script type='text/javascript' src='{$baseurl}/wp-tinymce.php?c=1&amp;$version'></script>\n";
 			} else {
-				echo "<script type='text/javascript' src='{$baseurl}/tiny_mce.js?$version'></script>\n";
-				echo "<script type='text/javascript' src='{$baseurl}/wp-tinymce-schema.js?$version'></script>\n";
+				echo "<script type='text/javascript' src='{$baseurl}/tinymce{$mce_suffix}.js?$version'></script>\n";
+				echo "<script type='text/javascript' src='{$baseurl}/plugins/compat3x/plugin{$suffix}.js?$version'></script>\n";
 			}
 
-			if ( 'en' != self::$mce_locale && isset($lang) )
-				echo "<script type='text/javascript'>\n$lang\n</script>\n";
-			else
+			echo "<script type='text/javascript'>\n" . self::wp_mce_translation() . "</script>\n";
+
+			if ( self::$ext_plugins ) {
+				// Load the old-format English strings to prevent unsightly labels in old style popups
 				echo "<script type='text/javascript' src='{$baseurl}/langs/wp-langs-en.js?$version'></script>\n";
+			}
 		}
 
-		$mce = ( self::$has_tinymce && wp_default_editor() == 'tinymce' ) || ! self::$has_quicktags;
-?>
-
-	<script type="text/javascript">
-		var wpActiveEditor;
-
-		(function(){
-			var init, ed, qt, first_init, DOM, el, i, mce = <?php echo (int) $mce; ?>;
-
-			if ( typeof(tinymce) == 'object' ) {
-				DOM = tinymce.DOM;
-				// mark wp_theme/ui.css as loaded
-				DOM.files[tinymce.baseURI.getURI() + '/themes/advanced/skins/wp_theme/ui.css'] = true;
-
-				DOM.events.add( DOM.select('.wp-editor-wrap'), 'mousedown', function(e){
-					if ( this.id )
-						wpActiveEditor = this.id.slice(3, -5);
-				});
+		/**
+		 * Fires after tinymce.js is loaded, but before any TinyMCE editor
+		 * instances are created.
+		 *
+		 * @since 3.9.0
+		 *
+		 * @param array $mce_settings TinyMCE settings array.
+		 */
+		do_action( 'wp_tiny_mce_init', self::$mce_settings );
 
-				for ( ed in tinyMCEPreInit.mceInit ) {
-					if ( first_init ) {
-						init = tinyMCEPreInit.mceInit[ed] = tinymce.extend( {}, first_init, tinyMCEPreInit.mceInit[ed] );
-					} else {
-						init = first_init = tinyMCEPreInit.mceInit[ed];
-					}
-
-					if ( mce )
-						try { tinymce.init(init); } catch(e){}
-				}
-			} else {
-				if ( tinyMCEPreInit.qtInit ) {
-					for ( i in tinyMCEPreInit.qtInit ) {
-						el = tinyMCEPreInit.qtInit[i].id;
-						if ( el )
-							document.getElementById('wp-'+el+'-wrap').onmousedown = function(){ wpActiveEditor = this.id.slice(3, -5); }
-					}
-				}
-			}
-
-			if ( typeof(QTags) == 'function' ) {
-				for ( qt in tinyMCEPreInit.qtInit ) {
-					try { quicktags( tinyMCEPreInit.qtInit[qt] ); } catch(e){}
-				}
-			}
-		})();
+		?>
+		<script type="text/javascript">
 		<?php
 
 		if ( self::$ext_plugins )
 			echo self::$ext_plugins . "\n";
 
-		if ( ! $compressed && $tmce_on ) {
-			?>
-			(function(){var t=tinyMCEPreInit,sl=tinymce.ScriptLoader,ln=t.ref.language,th=t.ref.theme,pl=t.ref.plugins;sl.markDone(t.base+'/langs/'+ln+'.js');sl.markDone(t.base+'/themes/'+th+'/langs/'+ln+'.js');sl.markDone(t.base+'/themes/'+th+'/langs/'+ln+'_dlg.js');sl.markDone(t.base+'/themes/advanced/skins/wp_theme/ui.css');tinymce.each(pl.split(','),function(n){if(n&&n.charAt(0)!='-'){sl.markDone(t.base+'/plugins/'+n+'/langs/'+ln+'.js');sl.markDone(t.base+'/plugins/'+n+'/langs/'+ln+'_dlg.js');}});})();
-			<?php
-		}
-
-		if ( !is_admin() )
+		if ( ! is_admin() )
 			echo 'var ajaxurl = "' . admin_url( 'admin-ajax.php', 'relative' ) . '";';
 
 		?>
+
+		( function() {
+			var init, edId, qtId, firstInit, wrapper;
+
+			if ( typeof tinymce !== 'undefined' ) {
+				for ( edId in tinyMCEPreInit.mceInit ) {
+					if ( firstInit ) {
+						init = tinyMCEPreInit.mceInit[edId] = tinymce.extend( {}, firstInit, tinyMCEPreInit.mceInit[edId] );
+					} else {
+						init = firstInit = tinyMCEPreInit.mceInit[edId];
+					}
+
+					wrapper = tinymce.DOM.select( '#wp-' + edId + '-wrap' )[0];
+
+					if ( ( tinymce.DOM.hasClass( wrapper, 'tmce-active' ) || ! tinyMCEPreInit.qtInit.hasOwnProperty( edId ) ) &&
+						! init.wp_skip_init ) {
+
+						try {
+							tinymce.init( init );
+
+							if ( ! window.wpActiveEditor ) {
+								window.wpActiveEditor = edId;
+							}
+						} catch(e){}
+					}
+				}
+			}
+
+			if ( typeof quicktags !== 'undefined' ) {
+				for ( qtId in tinyMCEPreInit.qtInit ) {
+					try {
+						quicktags( tinyMCEPreInit.qtInit[qtId] );
+
+						if ( ! window.wpActiveEditor ) {
+							window.wpActiveEditor = qtId;
+						}
+					} catch(e){};
+				}
+			}
+
+			if ( typeof jQuery !== 'undefined' ) {
+				jQuery('.wp-editor-wrap').on( 'click.wp-editor', function() {
+					if ( this.id ) {
+						window.wpActiveEditor = this.id.slice( 3, -5 );
+					}
+				});
+			} else {
+				for ( qtId in tinyMCEPreInit.qtInit ) {
+					document.getElementById( 'wp-' + qtId + '-wrap' ).onclick = function() {
+						window.wpActiveEditor = this.id.slice( 3, -5 );
+					}
+				}
+			}
+		}());
 		</script>
 		<?php
 
-		if ( in_array('wplink', self::$plugins, true) || in_array('link', self::$qt_buttons, true) )
+		if ( in_array( 'wplink', self::$plugins, true ) || in_array( 'link', self::$qt_buttons, true ) )
 			self::wp_link_dialog();
 
-		if ( in_array('wpfullscreen', self::$plugins, true) || in_array('fullscreen', self::$qt_buttons, true) )
+		if ( in_array( 'wpfullscreen', self::$plugins, true ) || in_array( 'fullscreen', self::$qt_buttons, true ) )
 			self::wp_fullscreen_html();
 
-		do_action('after_wp_tiny_mce', self::$mce_settings);
+		/**
+		 * Fires after any core TinyMCE editor instances are created.
+		 *
+		 * @since 3.2.0
+		 *
+		 * @param array $mce_settings TinyMCE settings array.
+		 */
+		do_action( 'after_wp_tiny_mce', self::$mce_settings );
 	}
 
 	public static function wp_fullscreen_html() {
 		global $content_width;
 		$post = get_post();
 
-		$width = isset($content_width) && 800 > $content_width ? $content_width : 800;
+		$width = isset( $content_width ) && 800 > $content_width ? $content_width : 800;
 		$width = $width + 22; // compensate for the padding and border
 		$dfw_width = get_user_setting( 'dfw_width', $width );
-		$save = isset($post->post_status) && $post->post_status == 'publish' ? __('Update') : __('Save');
-	?>
-	<div id="wp-fullscreen-body"<?php if ( is_rtl() ) echo ' class="rtl"'; ?>>
-	<div id="fullscreen-topbar">
-		<div id="wp-fullscreen-toolbar">
-			<div id="wp-fullscreen-close"><a href="#" onclick="fullscreen.off();return false;"><?php _e('Exit fullscreen'); ?></a></div>
+		$save = $post && $post->post_status == 'publish' ? __('Update') : __('Save');
+
+		?>
+		<div id="wp-fullscreen-body" class="wp-core-ui<?php if ( is_rtl() ) echo ' rtl'; ?>" data-theme-width="<?php echo (int) $width; ?>" data-dfw-width="<?php echo (int) $dfw_width; ?>">
+		<div id="fullscreen-topbar">
+			<div id="wp-fullscreen-toolbar">
+			<div id="wp-fullscreen-close"><a href="#" onclick="wp.editor.fullscreen.off();return false;"><?php _e('Exit fullscreen'); ?></a></div>
 			<div id="wp-fullscreen-central-toolbar" style="width:<?php echo $width; ?>px;">
 
-			<div id="wp-fullscreen-mode-bar"><div id="wp-fullscreen-modes">
-				<a href="#" onclick="fullscreen.switchmode('tinymce');return false;"><?php _e( 'Visual' ); ?></a>
-				<a href="#" onclick="fullscreen.switchmode('html');return false;"><?php _ex( 'Text', 'Name for the Text editor tab (formerly HTML)' ); ?></a>
-			</div></div>
+			<div id="wp-fullscreen-mode-bar">
+				<div id="wp-fullscreen-modes" class="button-group">
+					<a class="button wp-fullscreen-mode-tinymce" href="#" onclick="wp.editor.fullscreen.switchmode( 'tinymce' ); return false;"><?php _e( 'Visual' ); ?></a>
+					<a class="button wp-fullscreen-mode-html" href="#" onclick="wp.editor.fullscreen.switchmode( 'html' ); return false;"><?php _ex( 'Text', 'Name for the Text editor tab (formerly HTML)' ); ?></a>
+				</div>
+			</div>
 
-			<div id="wp-fullscreen-button-bar"><div id="wp-fullscreen-buttons" class="wp_themeSkin">
-	<?php
+			<div id="wp-fullscreen-button-bar"><div id="wp-fullscreen-buttons" class="mce-toolbar">
+		<?php
 
 		$buttons = array(
 			// format: title, onclick, show in both editors
-			'bold' => array( 'title' => __('Bold (Ctrl + B)'), 'onclick' => 'fullscreen.b();', 'both' => false ),
-			'italic' => array( 'title' => __('Italic (Ctrl + I)'), 'onclick' => 'fullscreen.i();', 'both' => false ),
-			'0' => 'separator',
-			'bullist' => array( 'title' => __('Unordered list (Alt + Shift + U)'), 'onclick' => 'fullscreen.ul();', 'both' => false ),
-			'numlist' => array( 'title' => __('Ordered list (Alt + Shift + O)'), 'onclick' => 'fullscreen.ol();', 'both' => false ),
-			'1' => 'separator',
-			'blockquote' => array( 'title' => __('Blockquote (Alt + Shift + Q)'), 'onclick' => 'fullscreen.blockquote();', 'both' => false ),
-			'image' => array( 'title' => __('Insert/edit image (Alt + Shift + M)'), 'onclick' => "fullscreen.medialib();", 'both' => true ),
-			'2' => 'separator',
-			'link' => array( 'title' => __('Insert/edit link (Alt + Shift + A)'), 'onclick' => 'fullscreen.link();', 'both' => true ),
-			'unlink' => array( 'title' => __('Unlink (Alt + Shift + S)'), 'onclick' => 'fullscreen.unlink();', 'both' => false ),
-			'3' => 'separator',
-			'help' => array( 'title' => __('Help (Alt + Shift + H)'), 'onclick' => 'fullscreen.help();', 'both' => false )
+			'bold' => array( 'title' => __('Bold (Ctrl + B)'), 'both' => false ),
+			'italic' => array( 'title' => __('Italic (Ctrl + I)'), 'both' => false ),
+			'bullist' => array( 'title' => __('Unordered list (Alt + Shift + U)'), 'both' => false ),
+			'numlist' => array( 'title' => __('Ordered list (Alt + Shift + O)'), 'both' => false ),
+			'blockquote' => array( 'title' => __('Blockquote (Alt + Shift + Q)'), 'both' => false ),
+			'wp-media-library' => array( 'title' => __('Media library (Alt + Shift + M)'), 'both' => true ),
+			'link' => array( 'title' => __('Insert/edit link (Alt + Shift + A)'), 'both' => true ),
+			'unlink' => array( 'title' => __('Unlink (Alt + Shift + S)'), 'both' => false ),
+			'help' => array( 'title' => __('Help (Alt + Shift + H)'), 'both' => false ),
 		);
 
+		/**
+		 * Filter the list of TinyMCE buttons for the fullscreen
+		 * 'Distraction-Free Writing' editor.
+		 *
+		 * @since 3.2.0
+		 *
+		 * @param array $buttons An array of TinyMCE buttons for the DFW editor.
+		 */
 		$buttons = apply_filters( 'wp_fullscreen_buttons', $buttons );
 
 		foreach ( $buttons as $button => $args ) {
-			if ( 'separator' == $args ) { ?>
-				<div><span aria-orientation="vertical" role="separator" class="mceSeparator"></span></div>
-	<?php		continue;
-			} ?>
+			if ( 'separator' == $args ) {
+				continue;
+			}
 
-			<div<?php if ( $args['both'] ) { ?> class="wp-fullscreen-both"<?php } ?>>
-			<a title="<?php echo $args['title']; ?>" onclick="<?php echo $args['onclick']; ?>return false;" class="mceButton mceButtonEnabled mce_<?php echo $button; ?>" href="#" id="wp_fs_<?php echo $button; ?>" role="button" aria-pressed="false">
-			<span class="mceIcon mce_<?php echo $button; ?>"></span>
-			</a>
+			$onclick = ! empty( $args['onclick'] ) ? ' onclick="' . $args['onclick'] . '"' : '';
+			$title = esc_attr( $args['title'] );
+			?>
+
+			<div class="mce-widget mce-btn<?php if ( $args['both'] ) { ?> wp-fullscreen-both<?php } ?>">
+			<button type="button" aria-label="<?php echo $title; ?>" title="<?php echo $title; ?>"<?php echo $onclick; ?> id="wp_fs_<?php echo $button; ?>">
+				<i class="mce-ico mce-i-<?php echo $button; ?>"></i>
+			</button>
 			</div>
-	<?php
-		} ?>
+			<?php
+		}
 
-			</div></div>
+		?>
+
+		</div></div>
 
-			<div id="wp-fullscreen-save">
-				<input type="button" class="button-primary right" value="<?php echo $save; ?>" onclick="fullscreen.save();" />
-				<span class="spinner"></span>
-				<span class="fs-saved"><?php if ( $post->post_status == 'publish' ) _e('Updated.'); else _e('Saved.'); ?></span>
-			</div>
+		<div id="wp-fullscreen-save">
+			<input type="button" class="button button-primary right" value="<?php echo $save; ?>" onclick="wp.editor.fullscreen.save();" />
+			<span class="wp-fullscreen-saved-message"><?php if ( $post && $post->post_status == 'publish' ) _e('Updated.'); else _e('Saved.'); ?></span>
+			<span class="wp-fullscreen-error-message"><?php _e('Save failed.'); ?></span>
+			<span class="spinner"></span>
+		</div>
 
-			</div>
+		</div>
 		</div>
 	</div>
-
-	<div id="wp-fullscreen-wrap" style="width:<?php echo $dfw_width; ?>px;">
-		<?php if ( post_type_supports($post->post_type, 'title') ) { ?>
-		<label id="wp-fullscreen-title-prompt-text" for="wp-fullscreen-title"><?php echo apply_filters( 'enter_title_here', __( 'Enter title here' ), $post ); ?></label>
-		<input type="text" id="wp-fullscreen-title" value="" autocomplete="off" />
-		<?php } ?>
-
-		<div id="wp-fullscreen-container">
-			<textarea id="wp_mce_fullscreen"></textarea>
-		</div>
-
+	<div id="wp-fullscreen-statusbar">
 		<div id="wp-fullscreen-status">
 			<div id="wp-fullscreen-count"><?php printf( __( 'Word count: %s' ), '<span class="word-count">0</span>' ); ?></div>
 			<div id="wp-fullscreen-tagline"><?php _e('Just write.'); ?></div>
@@ -764,7 +1326,7 @@
 	</div>
 
 	<div class="fullscreen-overlay" id="fullscreen-overlay"></div>
-	<div class="fullscreen-overlay fullscreen-fader fade-600" id="fullscreen-fader"></div>
+	<div class="fullscreen-overlay fullscreen-fader fade-300" id="fullscreen-fader"></div>
 	<?php
 	}
 
@@ -774,7 +1336,7 @@
 	 * @since 3.1.0
 	 *
 	 * @param array $args Optional. Accepts 'pagenum' and 's' (search) arguments.
-	 * @return array Results.
+	 * @return false|array Results.
 	 */
 	public static function wp_link_query( $args = array() ) {
 		$pts = get_post_types( array( 'public' => true ), 'objects' );
@@ -786,8 +1348,6 @@
 			'update_post_term_cache' => false,
 			'update_post_meta_cache' => false,
 			'post_status' => 'publish',
-			'order' => 'DESC',
-			'orderby' => 'post_date',
 			'posts_per_page' => 20,
 		);
 
@@ -841,17 +1401,20 @@
 		 *
 		 * @since 3.7.0
 		 *
+		 * @see 'wp_link_query_args' filter
+		 *
 		 * @param array $results {
 		 *     An associative array of query results.
 		 *
 		 *     @type array {
-		 *         @type int    'ID'        The post ID.
-		 *         @type string 'title'     The trimmed, escaped post title.
-		 *         @type string 'permalink' The post permalink.
-		 *         @type string 'info'      A 'Y/m/d'-formatted date for 'post' post type, the 'singular_name' post type label otherwise.
+		 *         @type int    $ID        Post ID.
+		 *         @type string $title     The trimmed, escaped post title.
+		 *         @type string $permalink Post permalink.
+		 *         @type string $info      A 'Y/m/d'-formatted date for 'post' post type,
+		 *                                 the 'singular_name' post type label otherwise.
 		 *     }
 		 * }
-		 * @param array $query   An array of WP_Query arguments. @see 'wp_link_query_args' filter
+		 * @param array $query  An array of WP_Query arguments.
 		 */
 		return apply_filters( 'wp_link_query', $results, $query );
 	}
@@ -862,58 +1425,68 @@
 	 * @since 3.1.0
 	 */
 	public static function wp_link_dialog() {
-	?>
-	<div style="display:none;">
-	<form id="wp-link" tabindex="-1">
-	<?php wp_nonce_field( 'internal-linking', '_ajax_linking_nonce', false ); ?>
-	<div id="link-selector">
-		<div id="link-options">
-			<p class="howto"><?php _e( 'Enter the destination URL' ); ?></p>
-			<div>
-				<label><span><?php _e( 'URL' ); ?></span><input id="url-field" type="text" name="href" /></label>
-			</div>
-			<div>
-				<label><span><?php _e( 'Title' ); ?></span><input id="link-title-field" type="text" name="linktitle" /></label>
-			</div>
-			<div class="link-target">
-				<label><input type="checkbox" id="link-target-checkbox" /> <?php _e( 'Open link in a new window/tab' ); ?></label>
-			</div>
-		</div>
-		<?php $show_internal = '1' == get_user_setting( 'wplink', '0' ); ?>
-		<p class="howto toggle-arrow <?php if ( $show_internal ) echo 'toggle-arrow-active'; ?>" id="internal-toggle"><?php _e( 'Or link to existing content' ); ?></p>
-		<div id="search-panel"<?php if ( ! $show_internal ) echo ' style="display:none"'; ?>>
-			<div class="link-search-wrapper">
-				<label>
-					<span class="search-label"><?php _e( 'Search' ); ?></span>
-					<input type="search" id="search-field" class="link-search-field" autocomplete="off" />
-					<span class="spinner"></span>
-				</label>
-			</div>
-			<div id="search-results" class="query-results">
-				<ul></ul>
-				<div class="river-waiting">
-					<span class="spinner"></span>
+		$search_panel_visible = '1' == get_user_setting( 'wplink', '0' ) ? ' search-panel-visible' : '';
+
+		// display: none is required here, see #WP27605
+		?>
+		<div id="wp-link-backdrop" style="display: none"></div>
+		<div id="wp-link-wrap" class="wp-core-ui<?php echo $search_panel_visible; ?>" style="display: none">
+		<form id="wp-link" tabindex="-1">
+		<?php wp_nonce_field( 'internal-linking', '_ajax_linking_nonce', false ); ?>
+		<div id="link-modal-title">
+			<?php _e( 'Insert/edit link' ) ?>
+			<button type="button" id="wp-link-close"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></button>
+	 	</div>
+		<div id="link-selector">
+			<div id="link-options">
+				<p class="howto"><?php _e( 'Enter the destination URL' ); ?></p>
+				<div>
+					<label><span><?php _e( 'URL' ); ?></span><input id="wp-link-url" type="text" /></label>
+				</div>
+				<div class="wp-link-text-field">
+					<label><span><?php _e( 'Link Text' ); ?></span><input id="wp-link-text" type="text" /></label>
+				</div>
+				<div class="link-target">
+					<label><span>&nbsp;</span><input type="checkbox" id="wp-link-target" /> <?php _e( 'Open link in a new window/tab' ); ?></label>
 				</div>
 			</div>
-			<div id="most-recent-results" class="query-results">
-				<div class="query-notice"><em><?php _e( 'No search term specified. Showing recent items.' ); ?></em></div>
-				<ul></ul>
-				<div class="river-waiting">
-					<span class="spinner"></span>
+			<p class="howto"><a href="#" id="wp-link-search-toggle"><?php _e( 'Or link to existing content' ); ?></a></p>
+			<div id="search-panel">
+				<div class="link-search-wrapper">
+					<label>
+						<span class="search-label"><?php _e( 'Search' ); ?></span>
+						<input type="search" id="wp-link-search" class="link-search-field" autocomplete="off" />
+						<span class="spinner"></span>
+					</label>
+				</div>
+				<div id="search-results" class="query-results" tabindex="0">
+					<ul></ul>
+					<div class="river-waiting">
+						<span class="spinner"></span>
+					</div>
+				</div>
+				<div id="most-recent-results" class="query-results" tabindex="0">
+					<div class="query-notice" id="query-notice-message">
+						<em class="query-notice-default"><?php _e( 'No search term specified. Showing recent items.' ); ?></em>
+						<em class="query-notice-hint screen-reader-text"><?php _e( 'Search or use up and down arrow keys to select an item.' ); ?></em>
+					</div>
+					<ul></ul>
+					<div class="river-waiting">
+						<span class="spinner"></span>
+					</div>
 				</div>
 			</div>
 		</div>
-	</div>
-	<div class="submitbox">
-		<div id="wp-link-update">
-			<input type="submit" value="<?php esc_attr_e( 'Add Link' ); ?>" class="button-primary" id="wp-link-submit" name="wp-link-submit">
+		<div class="submitbox">
+			<div id="wp-link-cancel">
+				<a class="submitdelete deletion" href="#"><?php _e( 'Cancel' ); ?></a>
+			</div>
+			<div id="wp-link-update">
+				<input type="submit" value="<?php esc_attr_e( 'Add Link' ); ?>" class="button button-primary" id="wp-link-submit" name="wp-link-submit">
+			</div>
 		</div>
-		<div id="wp-link-cancel">
-			<a class="submitdelete deletion" href="#"><?php _e( 'Cancel' ); ?></a>
+		</form>
 		</div>
-	</div>
-	</form>
-	</div>
-	<?php
+		<?php
 	}
 }