mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master-MDL-64290-imscc-restore-temp-dir' of https://github.com/mspall/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2018-12-06 08:57:32 +08:00
commit e96eb02e46
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backup/converter/imscc1/lib.php
View File

@ -37,9 +37,10 @@ class imscc1_converter extends base_converter {
* @return null|string backup::FORMAT_IMSCC1 if the Common Cartridge 1.0 is detected, null otherwise
*/
public static function detect_format($tempdir) {
global $CFG;
$filepath = $CFG->dataroot . '/temp/backup/' . $tempdir;
$filepath = make_backup_temp_directory($tempdir, false);
if (!is_dir($filepath)) {
throw new convert_helper_exception('tmp_backup_directory_not_found', $filepath);
}
$manifest = cc2moodle::get_manifest($filepath);
if (!empty($manifest)) {
// Looks promising, lets load some information.

7
backup/converter/imscc11/lib.php
View File

@ -38,9 +38,10 @@ class imscc11_converter extends base_converter {
* @return null|string backup::FORMAT_IMSCC11 if the Common Cartridge 1.1 is detected, null otherwise
*/
public static function detect_format($tempdir) {
global $CFG;
$filepath = $CFG->dataroot . '/temp/backup/' . $tempdir;
$filepath = make_backup_temp_directory($tempdir, false);
if (!is_dir($filepath)) {
throw new convert_helper_exception('tmp_backup_directory_not_found', $filepath);
}
$manifest = cc112moodle::get_manifest($filepath);
if (file_exists($manifest)) {
// Looks promising, lets load some information.