<!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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { 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>[16577] trunk/wp-admin/includes/file.php:
  Improve the wording of the file upload security message.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16577">16577</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-11-24 20:45:21 +0000 (Wed, 24 Nov 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Improve the wording of the file upload security message. props janeforshort. fixes <a href="http://trac.wordpress.org/ticket/13550">#13550</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.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 (16576 => 16577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php        2010-11-24 20:34:22 UTC (rev 16576)
+++ trunk/wp-admin/includes/file.php        2010-11-24 20:45:21 UTC (rev 16577)
</span><span class="lines">@@ -338,7 +338,7 @@
</span><span class="cx">                         $file['name'] = $proper_filename;
</span><span class="cx"> 
</span><span class="cx">                 if ( ( !$type || !$ext ) &amp;&amp; !current_user_can( 'unfiltered_upload' ) )
</span><del>-                        return call_user_func($upload_error_handler, $file, __( 'File type does not meet security guidelines. Try another.' ));
</del><ins>+                        return call_user_func($upload_error_handler, $file, __( 'Sorry, this file type is not permitted for security reasons.' ));
</ins><span class="cx"> 
</span><span class="cx">                 if ( !$ext )
</span><span class="cx">                         $ext = ltrim(strrchr($file['name'], '.'), '.');
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx">                         $file['name'] = $proper_filename;
</span><span class="cx"> 
</span><span class="cx">                 if ( ( !$type || !$ext ) &amp;&amp; !current_user_can( 'unfiltered_upload' ) )
</span><del>-                        return $upload_error_handler( $file, __( 'File type does not meet security guidelines. Try another.' ));
</del><ins>+                        return $upload_error_handler( $file, __( 'Sorry, this file type is not permitted for security reasons.' ));
</ins><span class="cx"> 
</span><span class="cx">                 if ( !$ext )
</span><span class="cx">                         $ext = ltrim(strrchr($file['name'], '.'), '.');
</span></span></pre>
</div>
</div>

</body>
</html>