L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-61766-master' of git://github.com/junpataleta/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2018-04-03 01:18:20 +02:00
parent 5db00dc3c9 a2e7a47a6e
commit f6873c2e31
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/xmldb/xmldb_structure.php
+8 -1
View File
@@ -234,7 +234,14 @@ class xmldb_structure extends xmldb_object {
// Normalize paths to compare them.
$filepath = realpath($this->name); // File path comes in name.
$filename = basename($filepath);
$structurepath = realpath($CFG->dirroot . DIRECTORY_SEPARATOR . $this->path . DIRECTORY_SEPARATOR . $filename);
$normalisedpath = $this->path;
if ($CFG->admin !== 'admin') {
$needle = 'admin/';
if (strpos($this->path, $needle) === 0) {
$normalisedpath = substr_replace($this->path, "$CFG->admin/", 0, strlen($needle));
}
}
$structurepath = realpath($CFG->dirroot . DIRECTORY_SEPARATOR . $normalisedpath . DIRECTORY_SEPARATOR . $filename);
if ($filepath !== $structurepath) {
$relativepath = dirname(str_replace(realpath($CFG->dirroot) . DIRECTORY_SEPARATOR, '', $filepath));
$this->errormsg = 'PATH attribute does not match file directory: ' . $relativepath;