Changeset 25692

Timestamp:

10/05/2013 02:24:21 PM (12 years ago)

Author:

nacin

Message:

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

Location:

trunk/src/wp-includes

Files:

• script-loader.php (modified) (4 diffs)
• version.php (modified) (1 diff)

trunk/src/wp-includes/script-loader.php

@@ -49 +49 @@
  */
 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() ) {
@@ -60 +63 @@
     $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';
@@ -532 +532 @@
  */
 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() )
@@ -541 +545 @@
     $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';

trunk/src/wp-includes/version.php

@@ -5 +5 @@
  * @global string $wp_version
  */
-$wp_version = '3.7-beta1-25639';
+$wp_version = '3.7-beta1-25639-src';
 
 /**