<!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>[12274] trunk/wp-includes/functions.php:
Set uploaded files extensions to lower case, fixes #11218</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12274">12274</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-11-25 05:04:30 +0000 (Wed, 25 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Set uploaded files extensions to lower case, fixes <a href="http://trac.wordpress.org/ticket/11218">#11218</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (12273 => 12274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2009-11-24 16:52:32 UTC (rev 12273)
+++ trunk/wp-includes/functions.php 2009-11-25 05:04:30 UTC (rev 12274)
</span><span class="lines">@@ -2105,11 +2105,11 @@
</span><span class="cx">
</span><span class="cx"> // separate the filename into a name and extension
</span><span class="cx"> $info = pathinfo($filename);
</span><del>- $ext = !empty($info['extension']) ? $info['extension'] : '';
- $name = basename($filename, ".{$ext}");
</del><ins>+ $ext = !empty($info['extension']) ? '.' . $info['extension'] : '';
+ $name = basename($filename, $ext);
</ins><span class="cx">
</span><span class="cx"> // edge case: if file is named '.ext', treat as an empty name
</span><del>- if( $name === ".$ext" )
</del><ins>+ if( $name === $ext )
</ins><span class="cx"> $name = '';
</span><span class="cx">
</span><span class="cx"> // Increment the file number until we have a unique file to save in $dir. Use $override['unique_filename_callback'] if supplied.
</span><span class="lines">@@ -2118,9 +2118,21 @@
</span><span class="cx"> } else {
</span><span class="cx"> $number = '';
</span><span class="cx">
</span><del>- if ( !empty( $ext ) )
- $ext = ".$ext";
</del><ins>+ // change '.ext' to lower case
+ if ( $ext && strtolower($ext) != $ext ) {
+ $ext2 = strtolower($ext);
+ $filename2 = preg_replace( '|' . preg_quote($ext) . '$|', $ext2, $filename );
</ins><span class="cx">
</span><ins>+ // check for both lower and upper case extension or image sub-sizes may be overwritten
+ while ( file_exists($dir . "/$filename") || file_exists($dir . "/$filename2") ) {
+ $new_number = $number + 1;
+ $filename = str_replace( "$number$ext", "$new_number$ext", $filename );
+ $filename2 = str_replace( "$number$ext2", "$new_number$ext2", $filename2 );
+ $number = $new_number;
+ }
+ return $filename2;
+ }
+
</ins><span class="cx"> while ( file_exists( $dir . "/$filename" ) ) {
</span><span class="cx"> if ( '' == "$number$ext" )
</span><span class="cx"> $filename = $filename . ++$number . $ext;
</span></span></pre>
</div>
</div>
</body>
</html>