<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[19420] trunk: Move WP_Editor to a _WP_Editors encapsulation.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19420">19420</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-11-23 19:06:52 +0000 (Wed, 23 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move WP_Editor to a _WP_Editors encapsulation.
* WP_Editor will return in 3.4 as a one true API for editor instances. Stick to wp_editor() for now.
* TinyMCE can now be forced on with tinymce = true. It defaults to the value for user_can_richedit().
* Restores wp_default_editor(), wp_link_query(), wp_link_dialog(), wp_fullscreen_html().
fixes <a href="http://core.trac.wordpress.org/ticket/19320">#19320</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminincludesdeprecatedphp">trunk/wp-admin/includes/deprecated.php</a></li>
<li><a href="#trunkwpincludesclasswpeditorphp">trunk/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunkwpincludesdeprecatedphp">trunk/wp-includes/deprecated.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludesjstinymcelangswplangsphp">trunk/wp-includes/js/tinymce/langs/wp-langs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (19419 => 19420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2011-11-23 18:53:11 UTC (rev 19419)
+++ trunk/wp-admin/admin-ajax.php 2011-11-23 19:06:52 UTC (rev 19420)
</span><span class="lines">@@ -1127,7 +1127,7 @@
</span><span class="cx"> $args['pagenum'] = ! empty( $_POST['page'] ) ? absint( $_POST['page'] ) : 1;
</span><span class="cx">
</span><span class="cx"> require(ABSPATH . WPINC . '/class-wp-editor.php');
</span><del>- $results = WP_Editor::wp_link_query( $args );
</del><ins>+ $results = _WP_Editors::wp_link_query( $args );
</ins><span class="cx">
</span><span class="cx"> if ( ! isset( $results ) )
</span><span class="cx"> die( '0' );
</span></span></pre></div>
<a id="trunkwpadminincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/deprecated.php (19419 => 19420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/deprecated.php 2011-11-23 18:53:11 UTC (rev 19419)
+++ trunk/wp-admin/includes/deprecated.php 2011-11-23 19:06:52 UTC (rev 19420)
</span><span class="lines">@@ -711,27 +711,21 @@
</span><span class="cx"> function wp_tiny_mce( $teeny = false, $settings = false ) {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
</span><span class="cx">
</span><del>- global $wp_editor;
</del><span class="cx"> static $num = 1;
</span><span class="cx">
</span><del>- if ( !is_a($wp_editor, 'WP_Editor') ) {
- if ( !class_exists('WP_Editor') )
- require_once( ABSPATH . WPINC . '/class-wp-editor.php' );
</del><ins>+ if ( ! class_exists('_WP_Editors' ) )
+ require_once( ABSPATH . WPINC . '/class-wp-editor.php' );
</ins><span class="cx">
</span><del>- $wp_editor = new WP_Editor;
- }
</del><ins>+ $editor_id = 'content' . $num++;
</ins><span class="cx">
</span><del>- $editor_id = 'content' . $num;
- ++$num;
-
</del><span class="cx"> $set = array(
</span><span class="cx"> 'teeny' => $teeny,
</span><span class="cx"> 'tinymce' => $settings ? $settings : true,
</span><span class="cx"> 'quicktags' => false
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $set = $wp_editor->parse_settings($editor_id, $set);
- $wp_editor->editor_settings($editor_id, $set);
</del><ins>+ $set = _WP_Editors::parse_settings($editor_id, $set);
+ _WP_Editors::editor_settings($editor_id, $set);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -762,15 +756,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * @deprecated 3.3.0
- * @deprecated Use wp_editor()
- * @see wp_editor()
- */
-function wp_fullscreen_html() {
- _deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
-}
-
-/**
</del><span class="cx"> * Returns the screen layout options.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.8.0
</span></span></pre></div>
<a id="trunkwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-editor.php (19419 => 19420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-editor.php 2011-11-23 18:53:11 UTC (rev 19419)
+++ trunk/wp-includes/class-wp-editor.php 2011-11-23 19:06:52 UTC (rev 19420)
</span><span class="lines">@@ -8,31 +8,26 @@
</span><span class="cx"> * Private, not included by default. See wp_editor() in wp-includes/general-template.php.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-class WP_Editor {
</del><ins>+final class _WP_Editors {
+ public static $mce_locale;
</ins><span class="cx">
</span><del>- var $mce_settings = array();
- var $qt_settings = array();
- var $plugins = array();
- var $qt_buttons = array();
- var $mce_locale;
- var $ext_plugins;
- var $baseurl;
- var $can_richedit;
- var $default_editor;
- var $first_init;
- var $this_tinymce = false;
- var $this_quicktags = false;
- var $has_tinymce = false;
- var $has_quicktags = false;
- var $has_medialib = false;
- var $editor_buttons_css = true;
</del><ins>+ private static $mce_settings = array();
+ private static $qt_settings = array();
+ private static $plugins = array();
+ private static $qt_buttons = array();
+ private static $ext_plugins;
+ private static $baseurl;
+ private static $first_init;
+ private static $this_tinymce = false;
+ private static $this_quicktags = false;
+ private static $has_tinymce = false;
+ private static $has_quicktags = false;
+ private static $has_medialib = false;
+ private static $editor_buttons_css = true;
</ins><span class="cx">
</span><del>- function __construct() {
- $this->can_richedit = user_can_richedit();
- $this->default_editor = $this->wp_default_editor();
- }
</del><ins>+ private function __construct() {}
</ins><span class="cx">
</span><del>- function parse_settings($editor_id, $settings) {
</del><ins>+ public static function parse_settings($editor_id, $settings) {
</ins><span class="cx"> $set = wp_parse_args( $settings, array(
</span><span class="cx"> 'wpautop' => true, // use wpautop?
</span><span class="cx"> 'media_buttons' => true, // show insert/upload button(s)
</span><span class="lines">@@ -43,19 +38,23 @@
</span><span class="cx"> 'editor_class' => '', // add extra class(es) to the editor textarea
</span><span class="cx"> 'teeny' => false, // output the minimal editor config used in Press This
</span><span class="cx"> 'dfw' => false, // replace the default fullscreen with DFW (needs specific DOM elements and css)
</span><del>- 'tinymce' => true, // load TinyMCE, can be used to pass settings directly to TinyMCE using an array()
</del><ins>+ 'tinymce' => null, // load TinyMCE, can be used to pass settings directly to TinyMCE using an array()
</ins><span class="cx"> 'quicktags' => true // load Quicktags, can be used to pass settings directly to Quicktags using an array()
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- $this->this_tinymce = !empty($set['tinymce']) && $this->can_richedit;
- $this->this_quicktags = !empty($set['quicktags']);
</del><ins>+ if ( null === $set['tinymce'] )
+ self::$this_tinymce = user_can_richedit();
+ else
+ self::$this_tinymce = (bool) $set['tinymce'];
</ins><span class="cx">
</span><del>- if ( $this->this_tinymce )
- $this->has_tinymce = true;
</del><ins>+ self::$this_quicktags = (bool) $set['quicktags'];
</ins><span class="cx">
</span><del>- if ( $this->this_quicktags )
- $this->has_quicktags = true;
</del><ins>+ if ( self::$this_tinymce )
+ self::$has_tinymce = true;
</ins><span class="cx">
</span><ins>+ if ( self::$this_quicktags )
+ self::$has_quicktags = true;
+
</ins><span class="cx"> return $set;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -64,11 +63,11 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $content The initial content of the editor.
</span><span class="cx"> * @param string $editor_id ID for the textarea and TinyMCE and Quicktags instances (can contain only ASCII letters and numbers).
</span><del>- * @param array $settings See WP_Editor::_parse_settings for description.
</del><ins>+ * @param array $settings See the _parse_settings() method for description.
</ins><span class="cx"> */
</span><del>- function editor( $content, $editor_id, $settings = array() ) {
</del><ins>+ public static function editor( $content, $editor_id, $settings = array() ) {
</ins><span class="cx">
</span><del>- $set = $this->parse_settings($editor_id, $settings);
</del><ins>+ $set = self::parse_settings($editor_id, $settings);
</ins><span class="cx"> $editor_class = ' class="' . trim( $set['editor_class'] . ' wp-editor-area' ) . '"';
</span><span class="cx"> $tabindex = $set['tabindex'] ? ' tabindex="' . (int) $set['tabindex'] . '"' : '';
</span><span class="cx"> $rows = ' rows="' . (int) $set['textarea_rows'] . '"';
</span><span class="lines">@@ -78,10 +77,10 @@
</span><span class="cx"> if ( !current_user_can( 'upload_files' ) )
</span><span class="cx"> $set['media_buttons'] = false;
</span><span class="cx">
</span><del>- if ( $this->this_quicktags && $this->this_tinymce ) {
</del><ins>+ if ( self::$this_quicktags && self::$this_tinymce ) {
</ins><span class="cx"> $switch_class = 'html-active';
</span><span class="cx">
</span><del>- if ( 'html' == $this->default_editor ) {
</del><ins>+ if ( 'html' == wp_default_editor() ) {
</ins><span class="cx"> add_filter('the_editor_content', 'wp_htmledit_pre');
</span><span class="cx"> } else {
</span><span class="cx"> add_filter('the_editor_content', 'wp_richedit_pre');
</span><span class="lines">@@ -94,9 +93,9 @@
</span><span class="cx">
</span><span class="cx"> echo '<div id="wp-' . $editor_id . '-wrap" class="wp-editor-wrap ' . $switch_class . '">';
</span><span class="cx">
</span><del>- if ( $this->editor_buttons_css ) {
</del><ins>+ if ( self::$editor_buttons_css ) {
</ins><span class="cx"> wp_print_styles('editor-buttons');
</span><del>- $this->editor_buttons_css = false;
</del><ins>+ self::$editor_buttons_css = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty($set['editor_css']) )
</span><span class="lines">@@ -107,7 +106,7 @@
</span><span class="cx"> echo $buttons;
</span><span class="cx">
</span><span class="cx"> if ( $set['media_buttons'] ) {
</span><del>- $this->has_medialib = true;
</del><ins>+ self::$has_medialib = true;
</ins><span class="cx">
</span><span class="cx"> if ( !function_exists('media_buttons') )
</span><span class="cx"> include(ABSPATH . 'wp-admin/includes/media.php');
</span><span class="lines">@@ -125,24 +124,24 @@
</span><span class="cx"> printf($the_editor, $content);
</span><span class="cx"> echo "\n</div>\n\n";
</span><span class="cx">
</span><del>- $this->editor_settings($editor_id, $set);
</del><ins>+ self::editor_settings($editor_id, $set);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function editor_settings($editor_id, $set) {
</del><ins>+ public static function editor_settings($editor_id, $set) {
</ins><span class="cx"> global $editor_styles;
</span><span class="cx"> $first_run = false;
</span><span class="cx">
</span><del>- if ( empty($this->first_init) ) {
</del><ins>+ if ( empty(self::$first_init) ) {
</ins><span class="cx"> if ( is_admin() ) {
</span><del>- add_action( 'admin_print_footer_scripts', array($this, 'editor_js'), 50 );
- add_action( 'admin_footer', array($this, 'enqueue_scripts'), 1 );
</del><ins>+ add_action( 'admin_print_footer_scripts', array( __CLASS__, 'editor_js'), 50 );
+ add_action( 'admin_footer', array( __CLASS__, 'enqueue_scripts'), 1 );
</ins><span class="cx"> } else {
</span><del>- add_action( 'wp_print_footer_scripts', array($this, 'editor_js'), 50 );
- add_action( 'wp_footer', array($this, 'enqueue_scripts'), 1 );
</del><ins>+ add_action( 'wp_print_footer_scripts', array( __CLASS__, 'editor_js'), 50 );
+ add_action( 'wp_footer', array( __CLASS__, 'enqueue_scripts'), 1 );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $this->this_quicktags ) {
</del><ins>+ if ( self::$this_quicktags ) {
</ins><span class="cx">
</span><span class="cx"> $qtInit = array(
</span><span class="cx"> 'id' => $editor_id,
</span><span class="lines">@@ -159,22 +158,22 @@
</span><span class="cx"> $qtInit['buttons'] .= ',fullscreen';
</span><span class="cx">
</span><span class="cx"> $qtInit = apply_filters('quicktags_settings', $qtInit, $editor_id);
</span><del>- $this->qt_settings[$editor_id] = $qtInit;
</del><ins>+ self::$qt_settings[$editor_id] = $qtInit;
</ins><span class="cx">
</span><del>- $this->qt_buttons = array_merge( $this->qt_buttons, explode(',', $qtInit['buttons']) );
</del><ins>+ self::$qt_buttons = array_merge( self::$qt_buttons, explode(',', $qtInit['buttons']) );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $this->this_tinymce ) {
</del><ins>+ if ( self::$this_tinymce ) {
</ins><span class="cx">
</span><del>- if ( empty($this->first_init) ) {
- $this->baseurl = includes_url('js/tinymce');
- $this->mce_locale = $mce_locale = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) ); // only ISO 639-1
</del><ins>+ 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
</ins><span class="cx"> $no_captions = (bool) apply_filters( 'disable_captions', '' );
</span><span class="cx"> $plugins = array( 'inlinepopups', 'spellchecker', 'tabfocus', 'paste', 'media', 'fullscreen', 'wordpress', 'wpeditimage', 'wpgallery', 'wplink', 'wpdialogs' );
</span><span class="cx"> $first_run = true;
</span><span class="cx">
</span><span class="cx"> if ( $set['teeny'] ) {
</span><del>- $this->plugins = $plugins = apply_filters( 'teeny_mce_plugins', array('inlinepopups', 'fullscreen', 'wordpress', 'wplink', 'wpdialogs'), $editor_id );
</del><ins>+ self::$plugins = $plugins = apply_filters( 'teeny_mce_plugins', array('inlinepopups', 'fullscreen', 'wordpress', 'wplink', 'wpdialogs'), $editor_id );
</ins><span class="cx"> $ext_plugins = '';
</span><span class="cx"> } else {
</span><span class="cx"> /*
</span><span class="lines">@@ -253,7 +252,7 @@
</span><span class="cx"> $ext_plugins .= 'tinyMCEPreInit.load_ext("' . $plugurl . '", "' . $mce_locale . '");' . "\n";
</span><span class="cx"> $ext_plugins .= 'tinymce.PluginManager.load("' . $name . '", "' . $url . '");' . "\n";
</span><span class="cx">
</span><del>- $this->ext_plugins .= $ext_plugins;
</del><ins>+ self::$ext_plugins .= $ext_plugins;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -263,7 +262,7 @@
</span><span class="cx"> if ( $set['dfw'] )
</span><span class="cx"> $plugins[] = 'wpfullscreen';
</span><span class="cx">
</span><del>- $this->plugins = $plugins;
</del><ins>+ self::$plugins = $plugins;
</ins><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> The following filter allows localization scripts to change the languages displayed in the spellchecker's drop-down menu.
</span><span class="lines">@@ -273,12 +272,12 @@
</span><span class="cx"> */
</span><span class="cx"> $mce_spellchecker_languages = apply_filters('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');
</span><span class="cx">
</span><del>- $this->first_init = array(
</del><ins>+ self::$first_init = array(
</ins><span class="cx"> 'mode' => 'exact',
</span><span class="cx"> 'width' => '100%',
</span><span class="cx"> 'theme' => 'advanced',
</span><span class="cx"> 'skin' => 'wp_theme',
</span><del>- 'language' => $this->mce_locale,
</del><ins>+ 'language' => self::$mce_locale,
</ins><span class="cx"> 'spellchecker_languages' => $mce_spellchecker_languages,
</span><span class="cx"> 'theme_advanced_toolbar_location' => 'top',
</span><span class="cx"> 'theme_advanced_toolbar_align' => 'left',
</span><span class="lines">@@ -317,7 +316,7 @@
</span><span class="cx"> 'paste_text_use_dialog' => true,
</span><span class="cx"> 'extended_valid_elements' => 'article[*],aside[*],audio[*],canvas[*],command[*],datalist[*],details[*],embed[*],figcaption[*],figure[*],footer[*],header[*],hgroup[*],keygen[*],mark[*],meter[*],nav[*],output[*],progress[*],section[*],source[*],summary,time[*],video[*],wbr',
</span><span class="cx"> 'wpeditimage_disable_captions' => $no_captions,
</span><del>- 'wp_fullscreen_content_css' => "$this->baseurl/plugins/wpfullscreen/css/wp-fullscreen.css",
</del><ins>+ 'wp_fullscreen_content_css' => self::$baseurl . '/plugins/wpfullscreen/css/wp-fullscreen.css',
</ins><span class="cx"> 'plugins' => implode( ',', $plugins )
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -352,7 +351,7 @@
</span><span class="cx"> $mce_css = trim( apply_filters( 'mce_css', $mce_css ), ' ,' );
</span><span class="cx">
</span><span class="cx"> if ( ! empty($mce_css) )
</span><del>- $this->first_init['content_css'] = $mce_css;
</del><ins>+ self::$first_init['content_css'] = $mce_css;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $set['teeny'] ) {
</span><span class="lines">@@ -389,7 +388,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( $first_run )
</span><del>- $mceInit = array_merge($this->first_init, $mceInit);
</del><ins>+ $mceInit = array_merge(self::$first_init, $mceInit);
</ins><span class="cx">
</span><span class="cx"> if ( is_array($set['tinymce']) )
</span><span class="cx"> $mceInit = array_merge($mceInit, $set['tinymce']);
</span><span class="lines">@@ -409,11 +408,11 @@
</span><span class="cx"> $mceInit['theme_advanced_buttons4'] = '';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $this->mce_settings[$editor_id] = $mceInit;
- } // end if $this->this_tinymce
</del><ins>+ self::$mce_settings[$editor_id] = $mceInit;
+ } // end if self::$this_tinymce
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function _parse_init($init) {
</del><ins>+ private static function _parse_init($init) {
</ins><span class="cx"> $options = '';
</span><span class="cx">
</span><span class="cx"> foreach ( $init as $k => $v ) {
</span><span class="lines">@@ -431,50 +430,31 @@
</span><span class="cx"> return '{' . trim( $options, ' ,' ) . '}';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /**
- * Find out which editor should be displayed by default.
- *
- * Works out which of the two editors to display as the current editor for a
- * user.
- *
- * @since 2.5.0
- *
- * @return string Either 'tinymce', or 'html', or 'test'
- */
- function wp_default_editor() {
- $r = user_can_richedit() ? 'tinymce' : 'html'; // defaults
- if ( $user = wp_get_current_user() ) { // look for cookie
- $ed = get_user_setting('editor', 'tinymce');
- $r = ( in_array($ed, array('tinymce', 'html', 'test') ) ) ? $ed : $r;
- }
- return apply_filters( 'wp_default_editor', $r ); // filter
- }
-
- function enqueue_scripts() {
</del><ins>+ public static function enqueue_scripts() {
</ins><span class="cx"> wp_enqueue_script('word-count');
</span><span class="cx">
</span><del>- if ( $this->has_tinymce )
</del><ins>+ if ( self::$has_tinymce )
</ins><span class="cx"> wp_enqueue_script('editor');
</span><span class="cx">
</span><del>- if ( $this->has_quicktags )
</del><ins>+ if ( self::$has_quicktags )
</ins><span class="cx"> wp_enqueue_script('quicktags');
</span><span class="cx">
</span><del>- if ( in_array('wplink', $this->plugins, true) || in_array('link', $this->qt_buttons, true) ) {
</del><ins>+ if ( in_array('wplink', self::$plugins, true) || in_array('link', self::$qt_buttons, true) ) {
</ins><span class="cx"> wp_enqueue_script('wplink');
</span><span class="cx"> wp_enqueue_script('wpdialogs-popup');
</span><span class="cx"> wp_enqueue_style('wp-jquery-ui-dialog');
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( in_array('wpfullscreen', $this->plugins, true) || in_array('fullscreen', $this->qt_buttons, true) )
</del><ins>+ if ( in_array('wpfullscreen', self::$plugins, true) || in_array('fullscreen', self::$qt_buttons, true) )
</ins><span class="cx"> wp_enqueue_script('wp-fullscreen');
</span><span class="cx">
</span><del>- if ( $this->has_medialib ) {
</del><ins>+ if ( self::$has_medialib ) {
</ins><span class="cx"> add_thickbox();
</span><span class="cx"> wp_enqueue_script('media-upload');
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function editor_js() {
</del><ins>+ public static function editor_js() {
</ins><span class="cx"> global $tinymce_version, $concatenate_scripts, $compress_scripts;
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -485,7 +465,7 @@
</span><span class="cx"> * If the plugin has a popup dialog, a query string can be added to the button action that opens it (in the plugin's code).
</span><span class="cx"> */
</span><span class="cx"> $version = 'ver=' . $tinymce_version;
</span><del>- $tmce_on = !empty($this->mce_settings);
</del><ins>+ $tmce_on = !empty(self::$mce_settings);
</ins><span class="cx">
</span><span class="cx"> if ( ! isset($concatenate_scripts) )
</span><span class="cx"> script_concat_settings();
</span><span class="lines">@@ -493,13 +473,13 @@
</span><span class="cx"> $compressed = $compress_scripts && $concatenate_scripts && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
</span><span class="cx"> && false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
</span><span class="cx">
</span><del>- if ( $tmce_on && 'en' != $this->mce_locale )
</del><ins>+ if ( $tmce_on && 'en' != self::$mce_locale )
</ins><span class="cx"> include_once(ABSPATH . WPINC . '/js/tinymce/langs/wp-langs.php');
</span><span class="cx">
</span><span class="cx"> $mceInit = $qtInit = '';
</span><span class="cx"> if ( $tmce_on ) {
</span><del>- foreach ( $this->mce_settings as $editor_id => $init ) {
- $options = $this->_parse_init( $init );
</del><ins>+ foreach ( self::$mce_settings as $editor_id => $init ) {
+ $options = self::_parse_init( $init );
</ins><span class="cx"> $mceInit .= "'$editor_id':{$options},";
</span><span class="cx"> }
</span><span class="cx"> $mceInit = '{' . trim($mceInit, ',') . '}';
</span><span class="lines">@@ -507,9 +487,9 @@
</span><span class="cx"> $mceInit = '{}';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty($this->qt_settings) ) {
- foreach ( $this->qt_settings as $editor_id => $init ) {
- $options = $this->_parse_init( $init );
</del><ins>+ if ( !empty(self::$qt_settings) ) {
+ foreach ( self::$qt_settings as $editor_id => $init ) {
+ $options = self::_parse_init( $init );
</ins><span class="cx"> $qtInit .= "'$editor_id':{$options},";
</span><span class="cx"> }
</span><span class="cx"> $qtInit = '{' . trim($qtInit, ',') . '}';
</span><span class="lines">@@ -518,43 +498,45 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $ref = array(
</span><del>- 'plugins' => implode( ',', $this->plugins ),
</del><ins>+ 'plugins' => implode( ',', self::$plugins ),
</ins><span class="cx"> 'theme' => 'advanced',
</span><del>- 'language' => $this->mce_locale
</del><ins>+ 'language' => self::$mce_locale
</ins><span class="cx"> );
</span><span class="cx">
</span><del>- do_action('before_wp_tiny_mce', $this->mce_settings);
</del><ins>+ do_action('before_wp_tiny_mce', self::$mce_settings);
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> tinyMCEPreInit = {
</span><del>- base : "<?php echo $this->baseurl; ?>",
</del><ins>+ base : "<?php echo self::$baseurl; ?>",
</ins><span class="cx"> suffix : "",
</span><span class="cx"> query : "<?php echo $version; ?>",
</span><span class="cx"> mceInit : <?php echo $mceInit; ?>,
</span><span class="cx"> qtInit : <?php echo $qtInit; ?>,
</span><del>- ref : <?php echo $this->_parse_init( $ref ); ?>,
</del><ins>+ ref : <?php echo self::_parse_init( $ref ); ?>,
</ins><span class="cx"> load_ext : function(url,lang){var sl=tinymce.ScriptLoader;sl.markDone(url+'/langs/'+lang+'.js');sl.markDone(url+'/langs/'+lang+'_dlg.js');}
</span><span class="cx"> };
</span><span class="cx"> </script>
</span><span class="cx"> <?php
</span><span class="cx">
</span><ins>+ $baseurl = self::$baseurl;
+
</ins><span class="cx"> if ( $tmce_on ) {
</span><span class="cx"> if ( $compressed )
</span><del>- echo "<script type='text/javascript' src='$this->baseurl/wp-tinymce.php?c=1&amp;$version'></script>\n";
</del><ins>+ echo "<script type='text/javascript' src='{$baseurl}/wp-tinymce.php?c=1&amp;$version'></script>\n";
</ins><span class="cx"> else
</span><del>- echo "<script type='text/javascript' src='$this->baseurl/tiny_mce.js?$version'></script>\n";
</del><ins>+ echo "<script type='text/javascript' src='{$baseurl}/tiny_mce.js?$version'></script>\n";
</ins><span class="cx">
</span><del>- if ( 'en' != $this->mce_locale && isset($lang) )
</del><ins>+ if ( 'en' != self::$mce_locale && isset($lang) )
</ins><span class="cx"> echo "<script type='text/javascript'>\n$lang\n</script>\n";
</span><span class="cx"> else
</span><del>- echo "<script type='text/javascript' src='$this->baseurl/langs/wp-langs-en.js?$version'></script>\n";
</del><ins>+ echo "<script type='text/javascript' src='{$baseurl}/langs/wp-langs-en.js?$version'></script>\n";
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> (function(){
</span><del>- var init, ed, qt, first_init, mce = <?php echo $this->default_editor == 'tinymce' ? 'true' : 'false'; ?>;
</del><ins>+ var init, ed, qt, first_init, mce = <?php echo wp_default_editor() == 'tinymce' ? 'true' : 'false'; ?>;
</ins><span class="cx">
</span><span class="cx"> if ( typeof(tinymce) == 'object' ) {
</span><span class="cx"> for ( ed in tinyMCEPreInit.mceInit ) {
</span><span class="lines">@@ -584,8 +566,8 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>- if ( $this->ext_plugins )
- echo "$this->ext_plugins\n";
</del><ins>+ if ( self::$ext_plugins )
+ echo self::$ext_plugins . "\n";
</ins><span class="cx">
</span><span class="cx"> if ( ! $compressed && $tmce_on ) {
</span><span class="cx"> ?>
</span><span class="lines">@@ -599,16 +581,16 @@
</span><span class="cx"> </script>
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>- if ( in_array('wplink', $this->plugins, true) || in_array('link', $this->qt_buttons, true) )
- $this->wp_link_dialog();
</del><ins>+ if ( in_array('wplink', self::$plugins, true) || in_array('link', self::$qt_buttons, true) )
+ self::wp_link_dialog();
</ins><span class="cx">
</span><del>- if ( in_array('wpfullscreen', $this->plugins, true) || in_array('fullscreen', $this->qt_buttons, true) )
- $this->wp_fullscreen_html();
</del><ins>+ if ( in_array('wpfullscreen', self::$plugins, true) || in_array('fullscreen', self::$qt_buttons, true) )
+ self::wp_fullscreen_html();
</ins><span class="cx">
</span><del>- do_action('after_wp_tiny_mce', $this->mce_settings);
</del><ins>+ do_action('after_wp_tiny_mce', self::$mce_settings);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function wp_fullscreen_html() {
</del><ins>+ public static function wp_fullscreen_html() {
</ins><span class="cx"> global $content_width, $post;
</span><span class="cx">
</span><span class="cx"> $width = isset($content_width) && 800 > $content_width ? $content_width : 800;
</span><span class="lines">@@ -705,7 +687,7 @@
</span><span class="cx"> * @param array $args Optional. Accepts 'pagenum' and 's' (search) arguments.
</span><span class="cx"> * @return array Results.
</span><span class="cx"> */
</span><del>- function wp_link_query( $args = array() ) {
</del><ins>+ public static function wp_link_query( $args = array() ) {
</ins><span class="cx"> $pts = get_post_types( array( 'public' => true ), 'objects' );
</span><span class="cx"> $pt_names = array_keys( $pts );
</span><span class="cx">
</span><span class="lines">@@ -758,7 +740,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><del>- function wp_link_dialog() {
</del><ins>+ public static function wp_link_dialog() {
</ins><span class="cx"> ?>
</span><span class="cx"> <div style="display:none;">
</span><span class="cx"> <form id="wp-link" tabindex="-1">
</span></span></pre></div>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (19419 => 19420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php 2011-11-23 18:53:11 UTC (rev 19419)
+++ trunk/wp-includes/deprecated.php 2011-11-23 19:06:52 UTC (rev 19420)
</span><span class="lines">@@ -2617,27 +2617,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Find out which editor should be displayed
- *
- * @see WP_Editor::wp_default_editor()
- * @since 2.5.0
- * @deprecated 3.5
- *
- * @return bool
- */
-function wp_default_editor() {
- _deprecated_function( __FUNCTION__, '3.3' );
-
- global $wp_editor;
- if ( !is_a($wp_editor, 'WP_Editor') ) {
- require_once( ABSPATH . WPINC . '/class-wp-editor.php' );
- $wp_editor = new WP_Editor;
- }
-
- return $wp_editor->wp_default_editor();
-}
-
-/**
</del><span class="cx"> * Display editor: TinyMCE, HTML, or both.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.1.0
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (19419 => 19420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2011-11-23 18:53:11 UTC (rev 19419)
+++ trunk/wp-includes/general-template.php 2011-11-23 19:06:52 UTC (rev 19420)
</span><span class="lines">@@ -1766,11 +1766,29 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Loads and initializes WP_Editor class (if needed), passes the settings for an instance of the editor
</del><ins>+ * Find out which editor should be displayed by default.
</ins><span class="cx"> *
</span><ins>+ * Works out which of the two editors to display as the current editor for a
+ * user.
+ *
+ * @since 2.5.0
+ *
+ * @return string Either 'tinymce', or 'html', or 'test'
+ */
+function wp_default_editor() {
+ $r = user_can_richedit() ? 'tinymce' : 'html'; // defaults
+ if ( $user = wp_get_current_user() ) { // look for cookie
+ $ed = get_user_setting('editor', 'tinymce');
+ $r = ( in_array($ed, array('tinymce', 'html', 'test') ) ) ? $ed : $r;
+ }
+ return apply_filters( 'wp_default_editor', $r ); // filter
+}
+
+/**
+ * Renders an editor.
+ *
</ins><span class="cx"> * Using this function is the proper way to output all needed components for both TinyMCE and Quicktags.
</span><del>- * WP_Editor shouldn't be instantiated separately as it keeps track of loaded scripts.
- * See http://core.trac.wordpress.org/ticket/17144.
</del><ins>+ * _WP_Editors should not be used directly. See http://core.trac.wordpress.org/ticket/17144.
</ins><span class="cx"> *
</span><span class="cx"> * NOTE: Once initialized the TinyMCE editor cannot be safely moved in the DOM. For that reason
</span><span class="cx"> * running wp_editor() inside of a metabox is not a good idea unless only Quicktags is used.
</span><span class="lines">@@ -1783,17 +1801,13 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $content Initial content for the editor.
</span><span class="cx"> * @param string $editor_id HTML ID attribute value for the textarea and TinyMCE. Can only be /[a-z]+/.
</span><del>- * @param array $settings See WP_Editor::editor().
</del><ins>+ * @param array $settings See _WP_Editors::editor().
</ins><span class="cx"> */
</span><span class="cx"> function wp_editor( $content, $editor_id, $settings = array() ) {
</span><del>- global $wp_editor;
-
- if ( !is_a($wp_editor, 'WP_Editor') ) {
</del><ins>+ if ( ! class_exists( '_WP_Editors' ) )
</ins><span class="cx"> require( ABSPATH . WPINC . '/class-wp-editor.php' );
</span><del>- $wp_editor = new WP_Editor;
- }
</del><span class="cx">
</span><del>- $wp_editor->editor($content, $editor_id, $settings);
</del><ins>+ _WP_Editors::editor($content, $editor_id, $settings);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesjstinymcelangswplangsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/langs/wp-langs.php (19419 => 19420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/langs/wp-langs.php 2011-11-23 18:53:11 UTC (rev 19419)
+++ trunk/wp-includes/js/tinymce/langs/wp-langs.php 2011-11-23 19:06:52 UTC (rev 19420)
</span><span class="lines">@@ -1,16 +1,13 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>-// escape text only if it needs translating
</del><span class="cx"> function mce_escape($text) {
</span><del>- global $wp_editor;
-
- if ( 'en' == $wp_editor->mce_locale )
- return $text;
- else
- return esc_js($text);
</del><ins>+ return esc_js($text);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-$lang = 'tinyMCE.addI18n({' . $this->mce_locale . ':{
</del><ins>+if ( ! class_exists( '_WP_Editors' ) )
+ require( ABSPATH . WPINC . '/class-wp-editor.php' );
+
+$lang = 'tinyMCE.addI18n({' . _WP_Editors::$mce_locale . ':{
</ins><span class="cx"> common:{
</span><span class="cx"> edit_confirm:"' . mce_escape( __('Do you want to use the WYSIWYG mode for this textarea?') ) . '",
</span><span class="cx"> apply:"' . mce_escape( __('Apply') ) . '",
</span><span class="lines">@@ -232,7 +229,7 @@
</span><span class="cx"> }
</span><span class="cx"> }});
</span><span class="cx">
</span><del>-tinyMCE.addI18n("' . $this->mce_locale . '.advanced",{
</del><ins>+tinyMCE.addI18n("' . _WP_Editors::$mce_locale . '.advanced",{
</ins><span class="cx"> style_select:"' . mce_escape( /* translators: TinyMCE font styles */ _x('Styles', 'TinyMCE font styles') ) . '",
</span><span class="cx"> font_size:"' . mce_escape( __('Font size') ) . '",
</span><span class="cx"> fontdefault:"' . mce_escape( __('Font family') ) . '",
</span><span class="lines">@@ -298,7 +295,7 @@
</span><span class="cx"> toolbar:"' . mce_escape( __('Toolbar') ) . '"
</span><span class="cx"> });
</span><span class="cx">
</span><del>-tinyMCE.addI18n("' . $this->mce_locale . '.advanced_dlg",{
</del><ins>+tinyMCE.addI18n("' . _WP_Editors::$mce_locale . '.advanced_dlg",{
</ins><span class="cx"> about_title:"' . mce_escape( __('About TinyMCE') ) . '",
</span><span class="cx"> about_general:"' . mce_escape( __('About') ) . '",
</span><span class="cx"> about_help:"' . mce_escape( __('Help') ) . '",
</span><span class="lines">@@ -352,7 +349,7 @@
</span><span class="cx"> accessibility_usage_title:"' . mce_escape( __('General Usage') ) . '"
</span><span class="cx"> });
</span><span class="cx">
</span><del>-tinyMCE.addI18n("' . $this->mce_locale . '.media_dlg",{
</del><ins>+tinyMCE.addI18n("' . _WP_Editors::$mce_locale . '.media_dlg",{
</ins><span class="cx"> title:"' . mce_escape( __('Insert / edit embedded media') ) . '",
</span><span class="cx"> general:"' . mce_escape( __('General') ) . '",
</span><span class="cx"> advanced:"' . mce_escape( __('Advanced') ) . '",
</span><span class="lines">@@ -462,7 +459,7 @@
</span><span class="cx"> source:"' . mce_escape( __('Source') ) . '"
</span><span class="cx"> });
</span><span class="cx">
</span><del>-tinyMCE.addI18n("' . $this->mce_locale . '.wordpress",{
</del><ins>+tinyMCE.addI18n("' . _WP_Editors::$mce_locale . '.wordpress",{
</ins><span class="cx"> wp_adv_desc:"' . mce_escape( __('Show/Hide Kitchen Sink (Alt + Shift + Z)') ) . '",
</span><span class="cx"> wp_more_desc:"' . mce_escape( __('Insert More Tag (Alt + Shift + T)') ) . '",
</span><span class="cx"> wp_page_desc:"' . mce_escape( __('Insert Page break (Alt + Shift + P)') ) . '",
</span><span class="lines">@@ -477,7 +474,7 @@
</span><span class="cx"> delgallery:"' . mce_escape( __('Delete Gallery') ) . '"
</span><span class="cx"> });
</span><span class="cx">
</span><del>-tinyMCE.addI18n("' . $this->mce_locale . '.wpeditimage",{
</del><ins>+tinyMCE.addI18n("' . _WP_Editors::$mce_locale . '.wpeditimage",{
</ins><span class="cx"> edit_img:"' . mce_escape( __('Edit Image') ) . '",
</span><span class="cx"> del_img:"' . mce_escape( __('Delete Image') ) . '",
</span><span class="cx"> adv_settings:"' . mce_escape( __('Advanced Settings') ) . '",
</span></span></pre>
</div>
</div>
</body>
</html>