MDL-2674 backup always backsup/restores groups regardless of user settings; remerged...

diff --git a/backup/restore_form.html b/backup/restore_form.html
index 1520db9e59f3ab9a7a1fa9082e7250b3a8919682..d1eaae7b7c9f22e37eb2f859bad115498a5ae503 100644 (file)
--- a/backup/restore_form.html
+++ b/backup/restore_form.html
@@ -430,14 +430,15 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
         echo "<td align=\"right\" colspan=\"2\"><b>";
         $helplink = helpbutton('grouprestore', get_string('groups'), '', true, false, '', true);
         if (empty($CFG->enablegroupings)) {
-            echo get_string('groups').$helplink.":";
+            echo '<label for="menurestore_groups">'.get_string ("groups").'</label>'.$helplink;
             echo "</b></td><td colspan=\"2\">";
             $group_options[RESTORE_GROUPS_NONE] = get_string('no');
             $group_options[RESTORE_GROUPS_ONLY] = get_string('yes');
         } else {
-            echo get_string('groupsgroupings', 'group').$helplink.":";
+            echo '<label for="menurestore_groups">'.get_string ("groupsgroupings").'</label>'.$helplink;
             echo "</b></td><td colspan=\"2\">";
             $group_options[RESTORE_GROUPS_NONE] = get_string('none');
+            $group_options[RESTORE_GROUPS_ONLY] = get_string('groups');
             $group_options[RESTORE_GROUPINGS_ONLY] = get_string('groupingsonly', 'group');
             $group_options[RESTORE_GROUPS_GROUPINGS] = get_string('groupsgroupings', 'group'); //all.
 

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 1fefb1b4a8652a379fb7e7fb5cc9c40872dd2b28..8a618d5606bc611669019f63111ffd1f9c2945f1 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -1,6 +1,8 @@
 <?php //$Id$
     //Functions used in restore
 
+    require_once($CFG->libdir.'/gradelib.php');
+
 /**
  * Group backup/restore constants, 0.
  */