Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Append -src to the $wp_version in the develop repo (only) to allow for us to differentiate. see #25161. 

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


git-svn-id: http://core.svn.wordpress.org/trunk@25608 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-10-05 14:25:09 +00:00
parent 8392f942a4
commit 8e696740e5
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-includes/script-loader.php
View File

@ -48,7 +48,10 @@ require( ABSPATH . WPINC . '/functions.wp-styles.php' );
* @param object $scripts WP_Scripts object.
*/
function wp_default_scripts( &$scripts ) {
include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
if ( ! defined( 'SCRIPT_DEBUG' ) )
define( 'SCRIPT_DEBUG', false !== strpos( $wp_version, '-src' ) );
if ( ! $guessurl = site_url() ) {
$guessed_url = true;
@ -60,9 +63,6 @@ function wp_default_scripts( &$scripts ) {
$scripts->default_version = get_bloginfo( 'version' );
$scripts->default_dirs = array('/wp-admin/js/', '/wp-includes/js/');
if ( ! defined( 'SCRIPT_DEBUG' ) )
define( 'SCRIPT_DEBUG', ! file_exists( ABSPATH . WPINC . '/js/wp-util.min.js' ) );
$suffix = SCRIPT_DEBUG ? '' : '.min';
$scripts->add( 'utils', "/wp-includes/js/utils$suffix.js" );
@ -531,6 +531,10 @@ function wp_default_scripts( &$scripts ) {
* @param object $styles
*/
function wp_default_styles( &$styles ) {
include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
if ( ! defined( 'SCRIPT_DEBUG' ) )
define( 'SCRIPT_DEBUG', false !== strpos( $wp_version, '-src' ) );
if ( ! $guessurl = site_url() )
$guessurl = wp_guess_url();
@ -541,9 +545,6 @@ function wp_default_styles( &$styles ) {
$styles->text_direction = function_exists( 'is_rtl' ) && is_rtl() ? 'rtl' : 'ltr';
$styles->default_dirs = array('/wp-admin/', '/wp-includes/css/');
if ( ! defined( 'SCRIPT_DEBUG' ) )
define( 'SCRIPT_DEBUG', ! file_exists( ABSPATH . WPINC . '/js/wp-util.min.js' ) );
$suffix = SCRIPT_DEBUG ? '' : '.min';
$rtl_styles = array( 'wp-admin', 'ie', 'media', 'admin-bar', 'customize-controls', 'media-views', 'wp-color-picker' );