moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-32012' of git://github.com/merrill-oakland/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2012-05-01 12:37:59 +12:00
commit 2dcc93644f
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
mod/resource/backup/moodle1/lib.php
View file

@ -192,8 +192,17 @@ class moodle1_mod_resource_handler extends moodle1_mod_handler {
}
$this->fileman->filearea = 'content';
$this->fileman->itemid = 0;
// Rebuild the file path.
$curfilepath = '/';
if ($reference) {
$curfilepath = pathinfo('/'.$reference, PATHINFO_DIRNAME);
if ($curfilepath != '/') {
$curfilepath .= '/';
}
}
try {
$this->fileman->migrate_file('course_files/'.$reference, '/', null, 1);
$this->fileman->migrate_file('course_files/'.$reference, $curfilepath, null, 1);
} catch (moodle1_convert_exception $e) {
// the file probably does not exist
$this->log('error migrating the resource main file', backup::LOG_WARNING, 'course_files/'.$reference);