Changeset 18610

Timestamp:

08/26/2011 08:31:30 PM (13 years ago)

Author:

azaozz

Message:

Fix action 'wp_print_footer_scropts' (on the front-end), see #11520

Location:

trunk/wp-includes

Files:

• default-filters.php (modified) (3 diffs)
• script-loader.php (modified) (1 diff)

trunk/wp-includes/default-filters.php

@@ -215 +215 @@
 add_action( 'wp_head',             'wp_generator'                           );
 add_action( 'wp_head',             'rel_canonical'                          );
-add_action( 'wp_footer',           'wp_print_footer_scripts'                );
+add_action( 'wp_footer',           'wp_print_footer_scripts',         20    );
 add_action( 'wp_head',             'wp_shortlink_wp_head',            10, 0 );
 add_action( 'template_redirect',   'wp_shortlink_header',             11, 0 );
+add_action( 'wp_print_footer_scripts', '_wp_footer_scripts'                 );
 
 if ( isset( $_GET['replytocom'] ) )
@@ -224 +225 @@
 // Login actions
 add_action( 'login_head',          'wp_print_head_scripts',         9     );
-add_action( 'login_footer',        'wp_print_footer_scripts'              );
+add_action( 'login_footer',        'wp_print_footer_scripts',       20    );
 add_action( 'login_init',          'send_frame_options_header',     10, 0 );
 
@@ -245 +246 @@
 add_action( 'sanitize_comment_cookies',   'sanitize_comment_cookies'                       );
 add_action( 'admin_print_scripts',        'print_head_scripts',                      20    );
-add_action( 'admin_print_footer_scripts', 'wp_print_footer_scripts',                 20    );
+add_action( 'admin_print_footer_scripts', '_wp_footer_scripts'                             );
 add_action( 'admin_print_styles',         'print_admin_styles',                      20    );
 add_action( 'init',                       'smilies_init',                             5    );

trunk/wp-includes/script-loader.php

@@ -627 +627 @@
 
 /**
- * Hooks to print the scripts and styles in the footer.
- *
- * @since 2.8
- */
-function wp_print_footer_scripts() {
+ * Private, for use in *_footer_scripts hooks
+ *
+ * @since 3.3
+ */
+function _wp_footer_scripts() {
     print_late_styles();
     print_footer_scripts();
-
-    if ( !is_admin() )
-        do_action('wp_print_footer_scripts');
-
-    return true;
+}
+
+/**
+ * Hooks to print the scripts and styles in the footer.
+ *
+ * @since 2.8
+ */
+function wp_print_footer_scripts() {
+    do_action('wp_print_footer_scripts');
 }