Changeset 28203 for branches/3.9/src/wp-includes/class-wp-editor.php

Timestamp:

04/24/2014 10:05:42 PM (11 years ago)

Author:

nacin

Message:

Run WP_Editors::enqueue_scripts() on admin_print_footer_scripts, instead of admin_footer.

Fixes incompatibility with the customizer.

Merges [28187] to the 3.9 branch.

props feedmeastraycat.
fixes #27853.

Location:

branches/3.9

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-editor.php (modified) (1 diff)

branches/3.9/src/wp-includes/class-wp-editor.php

@@ -242 +242 @@
         if ( empty(self::$first_init) ) {
             if ( is_admin() ) {
-                add_action( 'admin_print_footer_scripts', array( __CLASS__, 'editor_js'), 50 );
-                add_action( 'admin_footer', array( __CLASS__, 'enqueue_scripts'), 1 );
+                add_action( 'admin_print_footer_scripts', array( __CLASS__, 'editor_js' ), 50 );
+                add_action( 'admin_print_footer_scripts', array( __CLASS__, 'enqueue_scripts' ), 1 );
             } else {
-                add_action( 'wp_print_footer_scripts', array( __CLASS__, 'editor_js'), 50 );
-                add_action( 'wp_footer', array( __CLASS__, 'enqueue_scripts'), 1 );
+                add_action( 'wp_print_footer_scripts', array( __CLASS__, 'editor_js' ), 50 );
+                add_action( 'wp_print_footer_scripts', array( __CLASS__, 'enqueue_scripts' ), 1 );
             }
         }