Skip to content
Snippets Groups Projects
Commit f4ce3991 authored by Robin Appelman's avatar Robin Appelman
Browse files

fix issue with moving music files

parent 469a80ac
Branches
No related tags found
No related merge requests found
......@@ -183,8 +183,8 @@ class OC_Files {
*/
public static function move($sourceDir,$source,$targetDir,$target){
if(OC_User::isLoggedIn()){
$targetFile=$targetDir.'/'.$target;
$sourceFile=$sourceDir.'/'.$source;
$targetFile=self::normalizePath($targetDir.'/'.$target);
$sourceFile=self::normalizePath($sourceDir.'/'.$source);
return OC_Filesystem::rename($sourceFile,$targetFile);
}
}
......@@ -305,4 +305,19 @@ class OC_Files {
$content.= "Options -Indexes\n";
@file_put_contents(OC::$SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it
}
/**
* normalize a path, removing any double, add leading /, etc
* @param string $path
* @return string
*/
static public function normalizePath($path){
$path='/'.$path;
$old='';
while($old!=$path){//replace any multiplicity of slashes with a single one
$old=$path;
$path=str_replace('//','/',$path);
}
return $path;
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment