Merged from MOODLE_14_STABLE: Adding fix for idnumber duplication problem in restorin...

diff --git a/backup/restore_execute.html b/backup/restore_execute.html
index 768d026535665fec6fda391e2e802bb7b4cfd6dc..35242c776cdc070c60b5d4c9f9084f39012bbd52 100644 (file)
--- a/backup/restore_execute.html
+++ b/backup/restore_execute.html
@@ -64,6 +64,7 @@
     //Saving conversion id variables into backup_tables
     if ($restore->restoreto == 2) {
         echo "<li>".get_string("creatingnewcourse");
+        $oldidnumber = $course_header->course_idnumber;
         if (!$status = restore_create_new_course($restore,$course_header)) {
             notify("Error while creating the new empty course.");
         }
@@ -72,6 +73,9 @@
             echo "<ul>";
             echo "<li>".$course_header->course_fullname." (".$course_header->course_shortname.")";
             echo "<li>".get_string("category").": ".$course_header->category->name;
+            if (!empty($oldidnumber)) {
+                echo "<li>".get_string("nomoreidnumber","moodle",$oldidnumber)."</li>";
+            }
             echo "</ul>";
             //Put the destination course_id
             $restore->course_id = $course_header->course_id;

diff --git a/backup/restorelib.php b/backup/restorelib.php
index d0e3f324e8025250cc79e41539c5455334768209..1b321d13d4c6a33fe2f453aadd9434268607835f 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -527,6 +527,7 @@
             $course->fullname = addslashes($course_header->course_fullname);
             $course->shortname = addslashes($course_header->course_shortname);
             $course->idnumber = addslashes($course_header->course_idnumber);
+            $course->idnumber = ''; //addslashes($course_header->course_idnumber); // we don't want this at all.
             $course->summary = restore_decode_absolute_links(addslashes($course_header->course_summary));
             $course->format = addslashes($course_header->course_format);
             $course->showgrades = addslashes($course_header->course_showgrades);

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index d87105e55f5c64e6a04c8bd7e08ca5ab3650a15f..1e60c58ccba67a52a62c18f31ba9bc72db2a51dc 100644 (file)
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -654,6 +654,8 @@ $string['loginto'] = 'Login to $a';
 $string['loginusing'] = 'Login here using your username and password';
 $string['logout'] = 'Logout';
 $string['logs'] = 'Logs';
+$string['logtoomanycourses'] = ' [ <a href=\"$a->url\">more</a> ] ';
+$string['logtoomanyusers'] = ' [ <a href=\"$a->url\">more</a> ] ';
 $string['mailadmins'] = 'Inform admins';
 $string['mailstudents'] = 'Inform students';
 $string['mailteachers'] = 'Inform teachers';
@@ -768,6 +770,7 @@ $string['nofilesyet'] = 'No files have been uploaded to your course yet';
 $string['nograde'] = 'No grade';
 $string['noimagesyet'] = 'No images have been uploaded to your course yet';
 $string['nomorecourses'] = 'No more matching courses could be found';
+$string['nomoreidnumber'] = 'Not using an idnumber to avoid collisions';
 $string['none'] = 'None';
 $string['nopotentialadmins'] = 'No potential admins';
 $string['nopotentialcreators'] = 'No potential course creators';