From ae6bf5bd80a696f7562614d76510e49ff3c169e5 Mon Sep 17 00:00:00 2001 From: nacin Date: Thu, 15 Mar 2012 12:53:39 +0000 Subject: [PATCH] Move wp_plupload_default_settings() to the admin_enqueue_scripts hook to prevent fatal errors when admin_init is run outside of normal admin-header execution, like admin-ajax. see #19910. fixes #20240. git-svn-id: http://svn.automattic.com/wordpress/trunk@20189 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/media.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-includes/media.php b/wp-includes/media.php index 31cad7159..2b6c273a9 100644 --- a/wp-includes/media.php +++ b/wp-includes/media.php @@ -1483,4 +1483,4 @@ function wp_plupload_default_settings() { $wp_scripts->add_data( 'wp-plupload', 'data', $script ); } -add_action( 'admin_init', 'wp_plupload_default_settings' ); +add_action( 'admin_enqueue_scripts', 'wp_plupload_default_settings' );