MDL-37774 Make moodle1_file_manager::migrate_directory() support trailing slash in rootpath

As the $rootpath is concatenated with the $relpath, we would end with a
path like course_files//file.txt. Such a path is detected as not-valid
later and an error would be thrown.

So the patch makes sure that the trailing slash is cut off and a
debugging for the developer is displayed.
This commit is contained in:
David Mudrák
2013-02-10 01:57:35 +01:00
parent bf46548670
commit a7b8726121
+5
View File
@@ -1278,6 +1278,11 @@ class moodle1_file_manager implements loggable {
*/
public function migrate_directory($rootpath, $relpath='/') {
// Check the trailing slash in the $rootpath
if (substr($rootpath, -1) === '/') {
$rootpath = substr($rootpath, 0, strlen($rootpath) - 1);
}
if (!file_exists($this->basepath.'/'.$rootpath.$relpath)) {
return array();
}