From: skodak <skodak>
Date: Mon, 16 Oct 2006 07:54:22 +0000 (+0000)
Subject: fixed error message when empty site full or short name - moved $SITE reinitialisation... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=6192fd6860993906c39f05094bb106ba0c74a298;p=moodle.git

fixed error message when empty site full or short name - moved $SITE reinitialisation into setting method; merged from MOODLE_17_STABLE
---

diff --git a/admin/settings.php b/admin/settings.php
index 7b6b739b9e..3c0107d967 100644
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -78,8 +78,7 @@ if ($data = data_submitted()) {
     } else {
         error(get_string('confirmsesskeybad', 'error'));
     }
-    //reload site
-    $SITE = get_record('course', 'id', $SITE->id);
+    //update $COURSE to match changed $SITE
     $COURSE = clone($SITE);
 }
 
diff --git a/lib/adminlib.php b/lib/adminlib.php
index f5c3cb289d..f12edf7739 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -1693,7 +1693,10 @@ class admin_setting_sitesettext extends admin_setting_configtext {
         $record->id = $this->id;
         $record->{$this->name} = $data;
         $record->timemodified = time();
-        return (update_record('course', $record) ? '' : get_string('errorsetting', 'admin') . $this->visiblename . '<br />');
+        $status = update_record('course', $record) ? '' : get_string('errorsetting', 'admin') . $this->visiblename . '<br />';
+        //now update $SITE
+        global $SITE;
+        $SITE = get_record('course', 'id', $SITE->id);
     }
 
 }