From: dongsheng <dongsheng>
Date: Thu, 26 Mar 2009 13:32:28 +0000 (+0000)
Subject: "MDL-17966, fixed installation blocker, merged from 1.9"
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a77476790311245266c86f1acbc39ff4ee55929e;p=moodle.git

"MDL-17966, fixed installation blocker, merged from 1.9"
---

diff --git a/lib/adminlib.php b/lib/adminlib.php
index ac5a36e8dc..f259ed8f80 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -2381,7 +2381,7 @@ 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};
+        return $site->{$this->name} != '' ? $site->{$this->name} : NULL;
     }
 
     public function validate($data) {