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

diff --git a/lib/adminlib.php b/lib/adminlib.php
index ac5a36e8dcb8cda1b3f5c91e298cab62bc15893d..f259ed8f808bc2ff4e563cccdf52255fe27e2367 100644 (file)
--- 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) {