Changeset 38459 for trunk/src/wp-includes/class-wp-editor.php

Timestamp:

08/31/2016 05:48:49 AM (8 years ago)

Author:

wonderboymusic

Message:

General: use get_bloginfo( 'version' ) instead of global $wp_version in several locations - excluding those locations which reload version.php mid-flight.

See #37699.

File:

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

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

@@ -297 +297 @@
      * @static
      *
-     * @global string $wp_version
      * @global string $tinymce_version
      *
@@ -304 +303 @@
      */
     public static function editor_settings($editor_id, $set) {
-        global $wp_version, $tinymce_version;
+        global $tinymce_version;
 
         if ( empty(self::$first_init) ) {
@@ -560 +559 @@
 
                 $suffix = SCRIPT_DEBUG ? '' : '.min';
-                $version = 'ver=' . $wp_version;
+                $version = 'ver=' . get_bloginfo( 'version' );
                 $dashicons = includes_url( "css/dashicons$suffix.css?$version" );
 
@@ -1132 +1131 @@
      *
      * @static
-     * @global string $wp_version
      * @global string $tinymce_version
      * @global bool   $concatenate_scripts
@@ -1138 +1136 @@
      */
     public static function editor_js() {
-        global $wp_version, $tinymce_version, $concatenate_scripts, $compress_scripts;
+        global $tinymce_version, $concatenate_scripts, $compress_scripts;
 
         /**
@@ -1216 +1214 @@
         $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( $wp_version, '-src' ) ? '' : '.min';
+        $mce_suffix = false !== strpos( get_bloginfo( 'version' ), '-src' ) ? '' : '.min';
 
         if ( $tmce_on ) {