sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@25692 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2013-10-05 14:24:21 +00:00
parent 1b37564f35
commit 29a12d6ee5
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,10 @@ require( ABSPATH . WPINC . '/functions.wp-styles.php' );
* @param object $scripts WP_Scripts object. * @param object $scripts WP_Scripts object.
*/ */
function wp_default_scripts( &$scripts ) { 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() ) { if ( ! $guessurl = site_url() ) {
$guessed_url = true; $guessed_url = true;
@ -60,9 +63,6 @@ function wp_default_scripts( &$scripts ) {
$scripts->default_version = get_bloginfo( 'version' ); $scripts->default_version = get_bloginfo( 'version' );
$scripts->default_dirs = array('/wp-admin/js/', '/wp-includes/js/'); $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'; $suffix = SCRIPT_DEBUG ? '' : '.min';
$scripts->add( 'utils', "/wp-includes/js/utils$suffix.js" ); $scripts->add( 'utils', "/wp-includes/js/utils$suffix.js" );
@ -531,6 +531,10 @@ function wp_default_scripts( &$scripts ) {
* @param object $styles * @param object $styles
*/ */
function wp_default_styles( &$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() ) if ( ! $guessurl = site_url() )
$guessurl = wp_guess_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->text_direction = function_exists( 'is_rtl' ) && is_rtl() ? 'rtl' : 'ltr';
$styles->default_dirs = array('/wp-admin/', '/wp-includes/css/'); $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'; $suffix = SCRIPT_DEBUG ? '' : '.min';
$rtl_styles = array( 'wp-admin', 'ie', 'media', 'admin-bar', 'customize-controls', 'media-views', 'wp-color-picker' ); $rtl_styles = array( 'wp-admin', 'ie', 'media', 'admin-bar', 'customize-controls', 'media-views', 'wp-color-picker' );

2
src/wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '3.7-beta1-25639'; $wp_version = '3.7-beta1-25639-src';
/** /**
* 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.