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

BUGFIX #4642: Fixed creation of folders in non-english languages.

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90552 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2009-10-31 01:25:32 +00:00
parent 0071e37840
commit 287887ccca
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
code/AssetAdmin.php
View File

@ -499,32 +499,34 @@ JS;
if(isset($parentObj->ID)) $filename = $parentObj->FullPath . $name; if(isset($parentObj->ID)) $filename = $parentObj->FullPath . $name;
else $filename = ASSETS_PATH . '/' . $name; else $filename = ASSETS_PATH . '/' . $name;
// Ensure uniqueness
$i = 2;
$baseFilename = $filename . '-';
while(file_exists($filename)) {
$filename = $baseFilename . $i;
$i++;
}
// Actually create // Actually create
if(!file_exists(ASSETS_PATH)) { if(!file_exists(ASSETS_PATH)) {
mkdir(ASSETS_PATH); mkdir(ASSETS_PATH);
} }
mkdir($filename);
chmod($filename, Filesystem::$file_create_mask);
// Create object
$p = new Folder(); $p = new Folder();
$p->ParentID = $parent; $p->ParentID = $parent;
$p->Name = $p->Title = basename($filename); $p->Name = $p->Title = basename($filename);
// Ensure uniqueness
$i = 2;
$baseFilename = substr($p->Filename, 0, -1) . '-';
while(file_exists($p->FullPath)) {
$p->Filename = $baseFilename . $i . '/';
$i++;
}
$p->write(); $p->write();
mkdir($p->FullPath);
chmod($p->FullPath, Filesystem::$file_create_mask);
if(isset($_REQUEST['returnID'])) { if(isset($_REQUEST['returnID'])) {
return $p->ID; return $p->ID;
} else { } else {
return $this->returnItemToUser($p); return $this->returnItemToUser($p);
} }
} }
/** /**