From 7aa8fbd1ddfb1924111cec6d22b4b4ec325dd786 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Thu, 24 Apr 2014 22:06:15 +0000 Subject: [PATCH] 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. Built from https://develop.svn.wordpress.org/branches/3.9@28203 git-svn-id: http://core.svn.wordpress.org/branches/3.9@28033 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-editor.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php index 022882f3a2..b74e76276e 100644 --- a/wp-includes/class-wp-editor.php +++ b/wp-includes/class-wp-editor.php @@ -241,11 +241,11 @@ final class _WP_Editors { 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 ); } }