Changeset 32543

Timestamp:

05/22/2015 05:09:38 AM (9 years ago)

Author:

wonderboymusic

Message:

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

See #32444.

File:

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

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

@@ -248 +248 @@
 
     /**
+     * @static
      *
-     * @static
+     * @global string $wp_version
+     * @global string $tinymce_version
+     *
      * @param string $editor_id
      * @param array  $set
      */
     public static function editor_settings($editor_id, $set) {
+        global $wp_version, $tinymce_version;
+
         $first_run = false;
 
@@ -498 +503 @@
                     'entity_encoding' => 'raw',
                     'keep_styles' => false,
-                    'cache_suffix' => 'wp-mce-' . $GLOBALS['tinymce_version'],
+                    'cache_suffix' => 'wp-mce-' . $tinymce_version,
 
                     // Limit the preview styles in the menu/toolbar
@@ -514 +519 @@
 
                 $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-                $version = 'ver=' . $GLOBALS['wp_version'];
+                $version = 'ver=' . $wp_version;
                 $dashicons = includes_url( "css/dashicons$suffix.css?$version" );
 
@@ -1065 +1070 @@
      *
      * @static
+     * @global string $wp_version
      * @global string $tinymce_version
      * @global bool   $concatenate_scripts
@@ -1070 +1076 @@
      */
     public static function editor_js() {
-        global $tinymce_version, $concatenate_scripts, $compress_scripts;
+        global $wp_version, $tinymce_version, $concatenate_scripts, $compress_scripts;
 
         /**
@@ -1148 +1154 @@
         $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';
+        $mce_suffix = false !== strpos( $wp_version, '-src' ) ? '' : '.min';
 
         if ( $tmce_on ) {