Changeset 24489
- Timestamp:
- 06/21/2013 09:29:58 AM (11 years ago)
- 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
- Property svn:mergeinfo changed
/trunk/wp-admin/includes/update-core.php merged: 24488
r23324 r24489 537 537 'wp-includes/js/jquery/ui/jquery.effects.fold.min.js', 538 538 'wp-admin/options-privacy.php', 539 // 3.5.2 540 'wp-includes/js/swfupload/swfupload-all.js', 539 541 ); 540 542 - Property svn:mergeinfo changed
-
branches/3.5/wp-includes/script-loader.php
r23340 r24489 247 247 $scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2201'); 248 248 $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'); 257 250 $scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20110524'); 258 251 did_action( 'init' ) && $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', $uploader_l10n );
Note: See TracChangeset
for help on using the changeset viewer.