Merge branch 'MDL-42293-master' of git://github.com/ankitagarwal/moodle

2013-10-24 10:27:23 +08:00
parent 459dbd4362 93fe4d2a11
commit 93488d8bb0
1 changed files with 5 additions and 0 deletions
@@ -79,6 +79,11 @@ class behat_repository_upload extends behat_files {
        $submit = $this->find_button(get_string('upload', 'repository'));

        // Attaching specified file to the node.
+        // Replace 'admin/' if it is in start of path with $CFG->admin .
+        $pos = strpos($filepath, 'admin/');
+        if ($pos === 0) {
+            $filepath = $CFG->admin . DIRECTORY_SEPARATOR . substr($filepath, 6);
+        }
        $filepath = str_replace('/', DIRECTORY_SEPARATOR, $filepath);
        $fileabsolutepath = $CFG->dirroot . DIRECTORY_SEPARATOR . $filepath;
        $file->attachFile($fileabsolutepath);