WordPress.org

Make WordPress Core

Changeset 24489 for branches/3.5


Ignore:
Timestamp:
06/21/2013 09:29:58 AM (6 years ago)
Author:
nacin
Message:

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

Location:
branches/3.5
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • branches/3.5

  • branches/3.5/wp-admin/includes/update-core.php

    r23324 r24489  
    537537'wp-includes/js/jquery/ui/jquery.effects.fold.min.js',
    538538'wp-admin/options-privacy.php',
     539// 3.5.2
     540'wp-includes/js/swfupload/swfupload-all.js',
    539541);
    540542
  • branches/3.5/wp-includes/script-loader.php

    r23340 r24489  
    247247    $scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2201');
    248248    $scripts->add( 'swfupload-speed', '/wp-includes/js/swfupload/plugins/swfupload.speed.js', array('swfupload'), '2201');
    249 
    250     if ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) {
    251         // queue all SWFUpload scripts that are used by default
    252         $scripts->add( 'swfupload-all', false, array('swfupload', 'swfupload-swfobject', 'swfupload-queue'), '2201');
    253     } else {
    254         $scripts->add( 'swfupload-all', '/wp-includes/js/swfupload/swfupload-all.js', array(), '2201a');
    255     }
    256 
     249    $scripts->add( 'swfupload-all', false, array('swfupload', 'swfupload-swfobject', 'swfupload-queue'), '2201');
    257250    $scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20110524');
    258251    did_action( 'init' ) && $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', $uploader_l10n );
Note: See TracChangeset for help on using the changeset viewer.