IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix uploader "file size exceeded" error message, fix displaying uploaded queue errors, see #18206

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19100 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz
2011-11-01 11:56:20 +00:00
parent b63ffa3f38
commit a2e4511e5f
11 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/js/plupload/handlers.dev.js
View File

@@ -205,7 +205,7 @@ function cancelUpload() {
// generic message
function wpQueueError(message) {
jQuery('#media-upload-error').show().html( '<div id="error"><p>' + message + '</p></div>' );
jQuery('#media-upload-error').show().html( '<div class="error"><p>' + message + '</p></div>' );
}
// file-specific message
@@ -305,7 +305,7 @@ function uploadError(fileObj, errorCode, message) {
wpFileError(fileObj, pluploadL10n.invalid_filetype);
break;
case plupload.FILE_SIZE_ERROR:
wpFileError(fileObj, pluploadL10n.upload_limit_exceeded);
wpQueueError( pluploadL10n.file_exceeds_size_limit.replace('%s', fileObj.name) );
break;
case plupload.IMAGE_FORMAT_ERROR:
wpFileError(fileObj, pluploadL10n.not_an_image);
@@ -403,6 +403,7 @@ jQuery(document).ready(function($){
fileQueued(file);
});
jQuery('#media-upload-error').html('');
up.refresh();
up.start();
});

2
wp-includes/js/plupload/handlers.js
View File

File diff suppressed because one or more lines are too long

10
wp-includes/script-loader.php
View File

@@ -190,7 +190,7 @@ function wp_default_scripts( &$scripts ) {
// error message for both plupload and swfupload
$uploader_l10n = array(
'queue_limit_exceeded' => __('You have attempted to queue too many files.'),
'file_exceeds_size_limit' => __('This file exceeds the maximum upload size for this site.'),
'file_exceeds_size_limit' => __('%s exceeds the maximum upload size for this site.'),
'zero_byte_file' => __('This file is empty. Please try another.'),
'invalid_filetype' => __('This file type is not allowed. Please try another.'),
'not_an_image' => __('This file is not an image. Please try another.'),
@@ -220,7 +220,7 @@ function wp_default_scripts( &$scripts ) {
// cannot use the plupload.full.js, as it loads browserplus init JS from Yahoo
$scripts->add( 'plupload-full', false, array('plupload', 'plupload-html5', 'plupload-flash', 'plupload-silverlight', 'plupload-html4'), '1.5b');
$scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array('plupload-full', 'jquery'), '20111031');
$scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array('plupload-full', 'jquery'), '20111101');
$scripts->add_script_data( 'plupload-handlers', 'pluploadL10n', $uploader_l10n );
// keep 'swfupload' for back-compat.
@@ -431,13 +431,13 @@ function wp_default_styles( &$styles ) {
// Any rtl stylesheets that don't have a .dev version for ltr
$no_suffix = array( 'farbtastic' );
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20111028' );
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20111101' );
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20111015' );
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
// all colors stylesheets need to have the same query strings (cache manifest compat)
$colors_version = '20111019';
$colors_version = '20111101';
// Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
$styles->add( 'colors', true, array('wp-admin'), $colors_version );
@@ -446,7 +446,7 @@ function wp_default_styles( &$styles ) {
$styles->add( 'colors-fresh', "/wp-admin/css/colors-fresh$suffix.css", array('wp-admin'), $colors_version );
$styles->add( 'colors-classic', "/wp-admin/css/colors-classic$suffix.css", array('wp-admin'), $colors_version );
$styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20110930' );
$styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20111101' );
$styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20110821' ); // Readme as well
$styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' );
$styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u1' );