Changeset 28108

Timestamp:

04/14/2014 12:06:03 AM (11 years ago)

Author:

nacin

Message:

Plupload: Restore 3.8 handles and filenames to avoid breaking plugins.

fixes #27763.

Location:

trunk/src/wp-includes

Files:

• js/plupload/plupload.flash.swf (moved) (moved from trunk/src/wp-includes/js/plupload/Moxie.swf)
• js/plupload/plupload.silverlight.xap (moved) (moved from trunk/src/wp-includes/js/plupload/Moxie.xap)
• media.php (modified) (1 diff)
• script-loader.php (modified) (1 diff)

trunk/src/wp-includes/media.php

@@ -2169 +2169 @@
         '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',

trunk/src/wp-includes/script-loader.php

@@ -267 +267 @@
     );
 
-    // 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' );
-
-    $scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array('plupload-all', 'jquery') );
+    // 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', '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 );