Changeset 18557

Timestamp:

08/17/2011 06:26:41 AM (14 years ago)

Author:

azaozz

Message:

Don't call debug_backtrace() in wp_scripts_init() and wp_styles_init(), props dd32, see #11526

Location:

trunk/wp-includes

Files:

• functions.wp-scripts.php (modified) (1 diff)
• functions.wp-styles.php (modified) (1 diff)

trunk/wp-includes/functions.wp-scripts.php

@@ -167 +167 @@
 
     if ( !$done && !is_a($wp_scripts, 'WP_Scripts') ) {
-        if ( !did_action('after_setup_theme') ) { // last action before init
-            $func = debug_backtrace();
-            $trace = !empty($func[1]['function']) ? $func[1]['function'] : __FUNCTION__;
-
-            _doing_it_wrong( $trace, __( '$wp_scripts should not be accessed before the "init" hook.' ), '3.3' );
-        }
+        if ( !did_action('after_setup_theme') ) // last action before init
+            _doing_it_wrong( __FUNCTION__, __( '$wp_scripts should not be accessed before the "init" hook.' ), '3.3' );
 
         $wp_scripts = new WP_Scripts();

trunk/wp-includes/functions.wp-styles.php

@@ -174 +174 @@
 
     if ( !$done && !is_a($wp_styles, 'WP_Styles') ) {
-        if ( !did_action('after_setup_theme') ) {
-            $func = debug_backtrace();
-            $trace = !empty($func[1]['function']) ? $func[1]['function'] : __FUNCTION__;
-
-            _doing_it_wrong( $trace, __( '$wp_styles should not be accessed before the "init" hook.' ), '3.3' );
-        }
+        if ( !did_action('after_setup_theme') )
+            _doing_it_wrong( __FUNCTION__, __( '$wp_styles should not be accessed before the "init" hook.' ), '3.3' );
 
         $wp_styles = new WP_Styles();