From dbeb0aa7f24f821c778f123702f506c36cf58718 Mon Sep 17 00:00:00 2001 From: dongsheng Date: Thu, 26 Mar 2009 02:34:42 +0000 Subject: [PATCH] "ADMINLIB/MDL-17966, update after writing settings, merged from 1.9" --- lib/adminlib.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/adminlib.php b/lib/adminlib.php index a3fc502459..264c8efd93 100644 --- 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) { -- 2.39.5