Index: wp-includes/script-loader.php
===================================================================
--- wp-includes/script-loader.php	(revision 23121)
+++ wp-includes/script-loader.php	(working copy)
@@ -195,7 +195,7 @@
 	$scripts->add( 'swfobject', "/wp-includes/js/swfobject.js", array(), '2.2-20120417');
 
 	// common bits for both uploaders
-	$max_upload_size = ( (int) ( $max_up = @ini_get('upload_max_filesize') ) < (int) ( $max_post = @ini_get('post_max_size') ) ) ? $max_up : $max_post;
+	$max_upload_size = min( (int) @ini_get('upload_max_filesize'), (int) @ini_get('post_max_size') ); 
 
 	if ( empty($max_upload_size) )
 		$max_upload_size = __('not configured');