Changeset 32935

Timestamp:

06/25/2015 02:28:50 AM (10 years ago)

Author:

azaozz

Message:

Define SCRIPT_DEBUG early on every load, similarly to WP_DEBUG. Remove defined( 'SCRIPT_DEBUG' ) checks.
Fixes #32333.

Location:

trunk/src

Files:

• wp-includes/class-wp-editor.php (modified) (2 diffs)
• wp-includes/default-constants.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

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

@@ -543 +543 @@
                 }
 
-                $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+                $suffix = SCRIPT_DEBUG ? '' : '.min';
                 $version = 'ver=' . $wp_version;
                 $dashicons = includes_url( "css/dashicons$suffix.css?$version" );
@@ -1135 +1135 @@
         );
 
-        $suffix = ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) ? '' : '.min';
+        $suffix = SCRIPT_DEBUG ? '' : '.min';
 
         /**

trunk/src/wp-includes/default-constants.php

@@ -72 +72 @@
         define('WP_CACHE', false);
 
+    // Add define('SCRIPT_DEBUG', true); to wp-config.php to enable loading of non-minified,
+    // non-concatenated scripts and stylesheets.
+    if ( ! defined( 'SCRIPT_DEBUG' ) ) {
+        if ( ! empty( $GLOBALS['wp_version'] ) ) {
+            $develop_src = false !== strpos( $GLOBALS['wp_version'], '-src' );
+        } else {
+            $develop_src = false;
+        }
+
+        define( 'SCRIPT_DEBUG', $develop_src );
+    }
+
     /**
      * Private

trunk/src/wp-includes/formatting.php

@@ -4256 +4256 @@
 
     $version = 'ver=' . $wp_version;
-    $develop_src = false !== strpos( $wp_version, '-src' );
-
-    if ( $develop_src || ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ) {
+
+    if ( SCRIPT_DEBUG ) {
         $settings['source'] = array(
             /** This filter is documented in wp-includes/class.wp-scripts.php */

trunk/src/wp-includes/general-template.php

@@ -2842 +2842 @@
 function register_admin_color_schemes() {
     $suffix = is_rtl() ? '-rtl' : '';
-    $suffix .= defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+    $suffix .= SCRIPT_DEBUG ? '' : '.min';
 
     wp_admin_css_color( 'fresh', _x( 'Default', 'admin color scheme' ),

trunk/src/wp-settings.php

@@ -30 +30 @@
 require( ABSPATH . WPINC . '/version.php' );
 
-// Set initial default constants including WP_MEMORY_LIMIT, WP_MAX_MEMORY_LIMIT, WP_DEBUG, WP_CONTENT_DIR and WP_CACHE.
+// Set initial default constants including WP_MEMORY_LIMIT, WP_MAX_MEMORY_LIMIT, WP_DEBUG, SCRIPT_DEBUG, WP_CONTENT_DIR and WP_CACHE.
 wp_initial_constants();