WordPress.org

Make WordPress Core

Ticket #27763: 27763.diff

File 27763.diff, 2.6 KB (added by nacin, 8 years ago)
  • src/wp-includes/media.php

    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
     
    21682168                'runtimes'            => 'html5,flash,silverlight,html4',
    21692169                'file_data_name'      => 'async-upload', // key passed to $_FILE.
    21702170                'url'                 => admin_url( 'async-upload.php', 'relative' ),
    2171                 'flash_swf_url'       => includes_url( 'js/plupload/Moxie.swf' ),
    2172                 'silverlight_xap_url' => includes_url( 'js/plupload/Moxie.xap' ),
     2171                'flash_swf_url'       => includes_url( 'js/plupload/plupload.flash.swf' ),
     2172                'silverlight_xap_url' => includes_url( 'js/plupload/plupload.silverlight.xap' ),
    21732173                'filters' => array(
    21742174                        'max_file_size'   => $max_upload_size . 'b',
    21752175                ),
  • src/wp-includes/script-loader.php

     
    266266                'error_uploading' => __('“%s” has failed to upload.')
    267267        );
    268268
    269         // Back compat
    270269        $scripts->add( 'plupload', '/wp-includes/js/plupload/plupload.full.min.js', array(), '2.1.1' );
    271         $scripts->add( 'plupload-all', '/wp-includes/js/plupload/plupload.full.min.js', array(), '2.1.1' );
     270        // Back compat handles:
     271        foreach ( array( 'all', 'html5', 'flash', 'silverlight', 'html4' ) as $handle ) {
     272                $scripts->add( "plupload-$handle", false, array( 'plupload' ), '2.1.1' );
     273        }
    272274
    273         $scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array('plupload-all', 'jquery') );
     275        $scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array( 'plupload', 'jquery' ) );
    274276        did_action( 'init' ) && $scripts->localize( 'plupload-handlers', 'pluploadL10n', $uploader_l10n );
    275277
    276         $scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array('plupload-all', 'jquery', 'json2', 'media-models'), false, 1 );
     278        $scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array( 'plupload', 'jquery', 'json2', 'media-models' ), false, 1 );
    277279        did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n );
    278280
    279281        // keep 'swfupload' for back-compat.