Changeset 24489 for branches/3.5/wp-includes/script-loader.php

Timestamp:

06/21/2013 09:29:58 AM (11 years ago)

Author:

nacin

Message:

Remove redundant swfupload-all.js file. Merges [24488] to the 3.5 branch.

Location:

branches/3.5

Files:

• . (modified) (1 prop)
• wp-includes/script-loader.php (modified) (1 diff)

branches/3.5/wp-includes/script-loader.php

@@ -247 +247 @@
     $scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2201');
     $scripts->add( 'swfupload-speed', '/wp-includes/js/swfupload/plugins/swfupload.speed.js', array('swfupload'), '2201');
-
-    if ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) {
-        // queue all SWFUpload scripts that are used by default
-        $scripts->add( 'swfupload-all', false, array('swfupload', 'swfupload-swfobject', 'swfupload-queue'), '2201');
-    } else {
-        $scripts->add( 'swfupload-all', '/wp-includes/js/swfupload/swfupload-all.js', array(), '2201a');
-    }
-
+    $scripts->add( 'swfupload-all', false, array('swfupload', 'swfupload-swfobject', 'swfupload-queue'), '2201');
     $scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20110524');
     did_action( 'init' ) && $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', $uploader_l10n );