MDL-2674 removed hardcoded renaming of groupings depending on changed course shortname

diff --git a/backup/restorelib.php b/backup/restorelib.php
index b726b36e8f44da7c529023f602e97c4f0aa84030..6466ddc6b6e0b526f43fc7cea20b78b624776542 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -3248,14 +3248,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
                 $gro = new Object();
                 ///$gro->id = backup_todb($info['GROUPING']['#']['ID']['0']['#']);
                 $gro->courseid    = $restore->course_id;
-                $oldname          = backup_todb($info['GROUPING']['#']['NAME']['0']['#']);
-                $oldshortname     = $restore->course_shortname;
-                if (false===strpos($oldname, $oldshortname)) {
-                    $gro->name = $oldname;
-                }
-                elseif ($shortname = get_field('course', 'shortname', 'id', $restore->course_id)) {
-                    $gro->name = preg_replace("/$oldshortname/", $shortname, $oldname);
-                }
+                $gro->name        = backup_todb($info['GROUPING']['#']['NAME']['0']['#']);
                 $gro->description = backup_todb($info['GROUPING']['#']['DESCRIPTION']['0']['#']);
                 $gro->configdata  = backup_todb($info['GROUPING']['#']['CONFIGDATA']['0']['#']);
                 $gro->timecreated = backup_todb($info['GROUPING']['#']['TIMECREATED']['0']['#']);