Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

Clean up @global doc blocks/imports for class-wp-editor.php.

Browse Source 
See #32444.

Built from https://develop.svn.wordpress.org/trunk@32543


git-svn-id: http://core.svn.wordpress.org/trunk@32513 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-05-22 05:10:24 +00:00
parent 082bfab426
commit 94f29f27a1
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-includes/class-wp-editor.php
View File

@ -247,12 +247,17 @@ final class _WP_Editors {
} }
/** /**
*
* @static * @static
*
* @global string $wp_version
* @global string $tinymce_version
*
* @param string $editor_id * @param string $editor_id
* @param array $set * @param array $set
*/ */
public static function editor_settings($editor_id, $set) { public static function editor_settings($editor_id, $set) {
global $wp_version, $tinymce_version;
$first_run = false; $first_run = false;
if ( empty(self::$first_init) ) { if ( empty(self::$first_init) ) {
@ -497,7 +502,7 @@ final class _WP_Editors {
'entities' => '38,amp,60,lt,62,gt', 'entities' => '38,amp,60,lt,62,gt',
'entity_encoding' => 'raw', 'entity_encoding' => 'raw',
'keep_styles' => false, 'keep_styles' => false,
'cache_suffix' => 'wp-mce-' . $GLOBALS['tinymce_version'], 'cache_suffix' => 'wp-mce-' . $tinymce_version,
// Limit the preview styles in the menu/toolbar // Limit the preview styles in the menu/toolbar
'preview_styles' => 'font-family font-size font-weight font-style text-decoration text-transform', 'preview_styles' => 'font-family font-size font-weight font-style text-decoration text-transform',
@ -513,7 +518,7 @@ final class _WP_Editors {
} }
$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
$version = 'ver=' . $GLOBALS['wp_version']; $version = 'ver=' . $wp_version;
$dashicons = includes_url( "css/dashicons$suffix.css?$version" ); $dashicons = includes_url( "css/dashicons$suffix.css?$version" );
// WordPress default stylesheet and dashicons // WordPress default stylesheet and dashicons
@ -1064,12 +1069,13 @@ final class _WP_Editors {
/** /**
* *
* @static * @static
* @global string $wp_version
* @global string $tinymce_version * @global string $tinymce_version
* @global bool $concatenate_scripts * @global bool $concatenate_scripts
* @global bool $compress_scripts * @global bool $compress_scripts
*/ */
public static function editor_js() { public static function editor_js() {
global $tinymce_version, $concatenate_scripts, $compress_scripts; global $wp_version, $tinymce_version, $concatenate_scripts, $compress_scripts;
/** /**
* Filter "tiny_mce_version" is deprecated * Filter "tiny_mce_version" is deprecated
@ -1147,7 +1153,7 @@ final class _WP_Editors {
$baseurl = self::$baseurl; $baseurl = self::$baseurl;
// Load tinymce.js when running from /src, else load wp-tinymce.js.gz (production) or tinymce.min.js (SCRIPT_DEBUG) // 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'; $mce_suffix = false !== strpos( $wp_version, '-src' ) ? '' : '.min';
if ( $tmce_on ) { if ( $tmce_on ) {
if ( $compressed ) { if ( $compressed ) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-alpha-32542'; $wp_version = '4.3-alpha-32543';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.