<!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>[11962] trunk/wp-admin/includes/template.php:

  Move the nonce on the import upload form to the action url so it always arrives even if the post data exceeds post_max_size

 .</title>

</head>

<body>

<div id="msg">

<dl>

<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11962">11962</a></dd>

<dt>Author</dt> <dd>westi</dd>

<dt>Date</dt> <dd>2009-09-23 06:59:20 +0000 (Wed, 23 Sep 2009)</dd>

</dl>

<h3>Log Message</h3>

<pre>Move the nonce on the import upload form to the action url so it always arrives even if the post data exceeds post_max_size. Also add some phpdoc. See <a href="http://trac.wordpress.org/ticket/10830">#10830</a>.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkwpadminincludestemplatephp"></a>

<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (11961 => 11962)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/includes/template.php        2009-09-23 06:51:19 UTC (rev 11961)

+++ trunk/wp-admin/includes/template.php        2009-09-23 06:59:20 UTC (rev 11962)

</span><span class="lines">@@ -2814,11 +2814,11 @@

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> /**

</span><del>- * {@internal Missing Short Description}}

</del><ins>+ * Outputs the form used by the importers to accept the data to be imported

</ins><span class="cx">  *

</span><del>- * @since unknown

</del><ins>+ * @since 2.0

</ins><span class="cx">  *

</span><del>- * @param unknown_type $action

</del><ins>+ * @param string $action The action attribute for the form.

</ins><span class="cx">  */

</span><span class="cx"> function wp_import_upload_form( $action ) {

</span><span class="cx">         $bytes = apply_filters( 'import_upload_size_limit', wp_max_upload_size() );

</span><span class="lines">@@ -2829,9 +2829,8 @@

</span><span class="cx">                 &lt;p&gt;&lt;strong&gt;&lt;?php echo $upload_dir['error']; ?&gt;&lt;/strong&gt;&lt;/p&gt;&lt;/div&gt;&lt;?php

</span><span class="cx">         else :

</span><span class="cx"> ?&gt;

</span><del>-&lt;form enctype=&quot;multipart/form-data&quot; id=&quot;import-upload-form&quot; method=&quot;post&quot; action=&quot;&lt;?php echo esc_attr($action) ?&gt;&quot;&gt;

</del><ins>+&lt;form enctype=&quot;multipart/form-data&quot; id=&quot;import-upload-form&quot; method=&quot;post&quot; action=&quot;&lt;?php echo esc_attr(wp_nonce_url($action, 'import-upload')); ?&gt;&quot;&gt;

</ins><span class="cx"> &lt;p&gt;

</span><del>-&lt;?php wp_nonce_field('import-upload'); ?&gt;

</del><span class="cx"> &lt;label for=&quot;upload&quot;&gt;&lt;?php _e( 'Choose a file from your computer:' ); ?&gt;&lt;/label&gt; (&lt;?php printf( __('Maximum size: %s' ), $size ); ?&gt;)

</span><span class="cx"> &lt;input type=&quot;file&quot; id=&quot;upload&quot; name=&quot;import&quot; size=&quot;25&quot; /&gt;

</span><span class="cx"> &lt;input type=&quot;hidden&quot; name=&quot;action&quot; value=&quot;save&quot; /&gt;

</span></span></pre>

</div>

</div>

</body>

</html>