mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

better preserve directory seperators

Browse Source
This commit is contained in:
Ian
2015-10-07 11:16:36 +02:00
parent e2b6417bd2
commit 994161a0a2
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/admin/images.inc.php
View File

@ -442,13 +442,11 @@ switch ($serendipity['GET']['adminAction']) {
}
if (!empty($serendipity['POST']['save'])) {
// preserve directory slashes, eg for dir/subdir/
$_newDir = str_replace('/', '_DS_', $serendipity['POST']['newDir']);
$_oldDir = str_replace('/', '_DS_', $serendipity['POST']['oldDir']);
$_newDir = serendipity_uploadSecure(serendipity_makeFilename($_newDir));
$_oldDir = serendipity_uploadSecure($_oldDir);
$newDir = str_replace('_DS_', '/', $_newDir);
$oldDir = str_replace('_DS_', '/', $_oldDir);
// preserve moving subdir directories to serendipity_makeFilename(), preserves dir/subdir/ for example
$_newDir = $serendipity['POST']['newDir'];
$newfile = serendipity_makeFilename(basename($_newDir));
$newDir = !empty(dirname($_newDir)) ? dirname($_newDir) . '/' . $newfile : $newfile;
$oldDir = serendipity_uploadSecure($serendipity['POST']['oldDir']);
if ($oldDir != $newDir) {
//is this possible? Ian: YES! Change an already set directory.