Wordpress 3.5.2

[autoinstalls/wordpress.git] / wp-includes / script-loader.php

diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 1fb5ae8867011fa060e36c19eb67461b0bf0c6c0..027f9d62757d248f4cdfe1ccbb8eb570b7b97569 100644 (file)
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -246,14 +246,7 @@ function wp_default_scripts( &$scripts ) {
        $scripts->add( 'swfupload-swfobject', '/wp-includes/js/swfupload/plugins/swfupload.swfobject.js', array('swfupload', 'swfobject'), '2201a');
        $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 );