vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-04 17:20:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
See #37699.


git-svn-id: https://develop.svn.wordpress.org/trunk@38459 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor
2016-08-31 05:48:49 +00:00
parent 2078dda129
commit 1825eff382
22 changed files with 51 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/wp-includes/class-wp-editor.php
View File

@@ -296,14 +296,13 @@ final class _WP_Editors {
/**
* @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;
global $tinymce_version;
if ( empty(self::$first_init) ) {
if ( is_admin() ) {
@@ -559,7 +558,7 @@ final class _WP_Editors {
}
$suffix = SCRIPT_DEBUG ? '' : '.min';
$version = 'ver=' . $wp_version;
$version = 'ver=' . get_bloginfo( 'version' );
$dashicons = includes_url( "css/dashicons$suffix.css?$version" );
// WordPress default stylesheet and dashicons
@@ -1131,13 +1130,12 @@ final class _WP_Editors {
/**
*
* @static
* @global string $wp_version
* @global string $tinymce_version
* @global bool $concatenate_scripts
* @global bool $compress_scripts
*/
public static function editor_js() {
global $wp_version, $tinymce_version, $concatenate_scripts, $compress_scripts;
global $tinymce_version, $concatenate_scripts, $compress_scripts;
/**
* Filters "tiny_mce_version" is deprecated
@@ -1215,7 +1213,7 @@ final class _WP_Editors {
$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 ) {
if ( $compressed ) {