"ADMINLIB/MDL-17966, update after writing settings, merged from 1.9"

diff --git a/lib/adminlib.php b/lib/adminlib.php
index a3fc502459f408cae41a9214064e858971412c70..264c8efd93bf2989b00e9b6d62b3d795b768b8a1 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -2357,8 +2357,9 @@ class admin_setting_courselist_frontpage extends admin_setting {
  */
 class admin_setting_sitesetcheckbox extends admin_setting_configcheckbox {
     public function get_setting() {
-        $site = get_site();
-        return $site->{$this->name};
+        global $SITE;
+        $_site = get_record('course', 'id', $SITE->id); 
+        return $_site->{$this->name};
     }
 
     public function write_setting($data) {
@@ -2377,8 +2378,9 @@ class admin_setting_sitesetcheckbox extends admin_setting_configcheckbox {
  */
 class admin_setting_sitesettext extends admin_setting_configtext {
     public function get_setting() {
-        $site = get_site();
-        return $site->{$this->name} != '' ? $site->{$this->name} : NULL;
+        global $SITE;
+        $_site = get_record('course', 'id', $SITE->id); 
+        return $_site->{$this->name};
     }
 
     public function validate($data) {
@@ -2418,8 +2420,9 @@ class admin_setting_special_frontpagedesc extends admin_setting {
     }
 
     public function get_setting() {
-        $site = get_site();
-        return $site->{$this->name};
+        global $SITE;
+        $_site = get_record('course', 'id', $SITE->id); 
+        return $_site->{$this->name};
     }
 
     public function write_setting($data) {