Changeset 24488

Timestamp:

06/21/2013 09:26:18 AM (11 years ago)

Author:

nacin

Message:

Remove redundant swfupload-all.js file.

Location:

trunk

Files:

• wp-admin/includes/update-core.php (modified) (1 diff)
• wp-includes/js/swfupload/swfupload-all.js (deleted)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/includes/update-core.php

@@ -550 +550 @@
 'wp-includes/class-wp-atom-server.php',
 'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css',
+// 3.5.2
+'wp-includes/js/swfupload/swfupload-all.js',
 );
 

trunk/wp-includes/script-loader.php

@@ -257 +257 @@
     $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 );