mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-30 03:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-30777_t2' of git://github.com/kiklop74/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2011-12-21 00:38:48 +01:00
commit 90022d184e
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +99,7 @@ class imscc1_converter extends base_converter {
$manifestdir = dirname($manifest);
$cc2moodle = new cc2moodle($manifest);
if ($cc2moodle->is_auth()) {
throw new imscc1_convert_exception('Protected cartridge content - Skipping import!');
throw new imscc1_convert_exception('protected_cc_not_supported');
}
$status = $cc2moodle->generate_moodle_xml();
//Final cleanup

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

@ -99,7 +99,7 @@ class imscc11_converter extends base_converter {
$manifestdir = dirname($manifest);
$cc112moodle = new cc112moodle($manifest);
if ($cc112moodle->is_auth()) {
throw new imscc11_convert_exception('Protected cartridge content - Skipping import!');
throw new imscc11_convert_exception('protected_cc_not_supported');
}
$status = $cc112moodle->generate_moodle_xml();
//Final cleanup

2
lang/en/error.php
View File

@ -530,3 +530,5 @@ $string['wwwrootslash'] = 'Detected incorrect $CFG->wwwroot in config.php, it mu
$string['xmldberror'] = 'XMLDB error!';
$string['alreadyloggedin'] = 'You are already logged in as {$a}, you need to log out before logging in as different user.';
$string['youcannotdeletecategory'] = 'You cannot delete category \'{$a}\' because you can neither delete the contents, nor move them elsewhere.';
$string['protected_cc_not_supported'] = 'Protected cartridges not supported.';