<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[11963] trunk/wp-admin/includes:
Handle the file upload case on import when post_max_size is smaller than upload_max_filesize and no POST data arrives at all
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11963">11963</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-09-23 07:06:58 +0000 (Wed, 23 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Handle the file upload case on import when post_max_size is smaller than upload_max_filesize and no POST data arrives at all. Fixes <a href="http://trac.wordpress.org/ticket/10830">#10830</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>
<li><a href="#trunkwpadminincludesimportphp">trunk/wp-admin/includes/import.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (11962 => 11963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php 2009-09-23 06:59:20 UTC (rev 11962)
+++ trunk/wp-admin/includes/file.php 2009-09-23 07:06:58 UTC (rev 11963)
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx">
</span><span class="cx"> // A non-empty file will pass this test.
</span><span class="cx"> if ( $test_size && !($file['size'] > 0 ) )
</span><del>- return $upload_error_handler( $file, __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini.' ));
</del><ins>+ return $upload_error_handler( $file, __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' ));
</ins><span class="cx">
</span><span class="cx"> // A properly uploaded file will pass this test. There should be no reason to override this one.
</span><span class="cx"> if (! @ is_uploaded_file( $file['tmp_name'] ) )
</span></span></pre></div>
<a id="trunkwpadminincludesimportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/import.php (11962 => 11963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/import.php 2009-09-23 06:59:20 UTC (rev 11962)
+++ trunk/wp-admin/includes/import.php 2009-09-23 07:06:58 UTC (rev 11963)
</span><span class="lines">@@ -59,6 +59,11 @@
</span><span class="cx"> * @return array
</span><span class="cx"> */
</span><span class="cx"> function wp_import_handle_upload() {
</span><ins>+ if ( !isset($_FILES['import']) ) {
+ $file['error'] = __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' );
+ return $file;
+ }
+
</ins><span class="cx"> $overrides = array( 'test_form' => false, 'test_type' => false );
</span><span class="cx"> $_FILES['import']['name'] .= '.txt';
</span><span class="cx"> $file = wp_handle_upload( $_FILES['import'], $overrides );
</span></span></pre>
</div>
</div>
</body>
</html>