From: skodak <skodak>
Date: Mon, 17 Mar 2008 22:09:25 +0000 (+0000)
Subject: MDL-2674 removed hardcoded renaming of groupings depending on changed course shortname
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=44b7235eefc60867f7a3ea90692f8abc613762f3;p=moodle.git

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

diff --git a/backup/restorelib.php b/backup/restorelib.php
index b726b36e8f..6466ddc6b6 100644
--- 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']['#']);