From bfe44f07a38ab686c76f3a6768c9fbd542df1291 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Mon, 14 Apr 2014 00:07:16 +0000
Subject: [PATCH] Plupload: Restore 3.8 handles and filenames to avoid breaking
 plugins.

fixes #27763.

Built from https://develop.svn.wordpress.org/trunk@28108


git-svn-id: http://core.svn.wordpress.org/trunk@27939 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../js/plupload/{Moxie.swf => plupload.flash.swf}   | Bin
 .../{Moxie.xap => plupload.silverlight.xap}         | Bin
 wp-includes/media.php                               |   4 ++--
 wp-includes/script-loader.php                       |  10 ++++++----
 4 files changed, 8 insertions(+), 6 deletions(-)
 rename wp-includes/js/plupload/{Moxie.swf => plupload.flash.swf} (100%)
 rename wp-includes/js/plupload/{Moxie.xap => plupload.silverlight.xap} (100%)

diff --git a/wp-includes/js/plupload/Moxie.swf b/wp-includes/js/plupload/plupload.flash.swf
similarity index 100%
rename from wp-includes/js/plupload/Moxie.swf
rename to wp-includes/js/plupload/plupload.flash.swf
diff --git a/wp-includes/js/plupload/Moxie.xap b/wp-includes/js/plupload/plupload.silverlight.xap
similarity index 100%
rename from wp-includes/js/plupload/Moxie.xap
rename to wp-includes/js/plupload/plupload.silverlight.xap
diff --git a/wp-includes/media.php b/wp-includes/media.php
index a92873062d..323ffd9f5e 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -2168,8 +2168,8 @@ function wp_plupload_default_settings() {
 		'runtimes'            => 'html5,flash,silverlight,html4',
 		'file_data_name'      => 'async-upload', // key passed to $_FILE.
 		'url'                 => admin_url( 'async-upload.php', 'relative' ),
-		'flash_swf_url'       => includes_url( 'js/plupload/Moxie.swf' ),
-		'silverlight_xap_url' => includes_url( 'js/plupload/Moxie.xap' ),
+		'flash_swf_url'       => includes_url( 'js/plupload/plupload.flash.swf' ),
+		'silverlight_xap_url' => includes_url( 'js/plupload/plupload.silverlight.xap' ),
 		'filters' => array(
 			'max_file_size'   => $max_upload_size . 'b',
 		),
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 21285f50ec..36725bd67d 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -266,14 +266,16 @@ function wp_default_scripts( &$scripts ) {
 		'error_uploading' => __('&#8220;%s&#8221; has failed to upload.')
 	);
 
-	// Back compat
 	$scripts->add( 'plupload', '/wp-includes/js/plupload/plupload.full.min.js', array(), '2.1.1' );
-	$scripts->add( 'plupload-all', '/wp-includes/js/plupload/plupload.full.min.js', array(), '2.1.1' );
+	// Back compat handles:
+	foreach ( array( 'all', 'html5', 'flash', 'silverlight', 'html4' ) as $handle ) {
+		$scripts->add( "plupload-$handle", false, array( 'plupload' ), '2.1.1' );
+	}
 
-	$scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array('plupload-all', 'jquery') );
+	$scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array( 'plupload', 'jquery' ) );
 	did_action( 'init' ) && $scripts->localize( 'plupload-handlers', 'pluploadL10n', $uploader_l10n );
 
-	$scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array('plupload-all', 'jquery', 'json2', 'media-models'), false, 1 );
+	$scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array( 'plupload', 'jquery', 'json2', 'media-models' ), false, 1 );
 	did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n );
 
 	// keep 'swfupload' for back-compat.