Merge branch 'MDL-42293-25' of git://github.com/ankitagarwal/moodle i…

…nto MOODLE_25_STABLE
moodle · Oct 24, 2013 · f9b6e96 · f9b6e96
2 parents 95fcab4 + a48e539
commit f9b6e96
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/repository/upload/tests/behat/behat_repository_upload.php b/repository/upload/tests/behat/behat_repository_upload.php
@@ -79,6 +79,11 @@ public function i_upload_file_to_filepicker($filepath, $filepickerelement) {
         $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);