tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX #5199 Duplicate file uploads have odd numbering attached to end of file (from r101068)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111581 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-10-04 04:44:14 +00:00
parent 81ce1e358d
commit a729b86df8
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
filesystem/Folder.php
View File

@ -249,12 +249,11 @@ class Folder extends File {
while(file_exists("$base/$file$ext")) { while(file_exists("$base/$file$ext")) {
$i++; $i++;
$oldFile = $file; $oldFile = $file;
$file = "$origFile-$i";
if(strpos($file, '.') !== false) { if(strpos($file, '.') !== false) {
$file = ereg_replace('[0-9]*(\.[^.]+$)',$i . '\\1', $file); $file = ereg_replace('[0-9]*(\.[^.]+$)', $i . '\\1', $file);
} else if (strpos($file, '_') !== false) { } elseif(strpos($file, '_') !== false) {
$file = ereg_replace('_([^_]+$)', '_'.$i, $file); $file = ereg_replace('_([^_]+$)', '_' . $i, $file);
} else { } else {
$file .= "_$i"; $file .= "_$i";
} }