fixed error message when empty site full or short name; merged from MOODLE_17_STABLE

diff --git a/admin/settings.php b/admin/settings.php
index ebf5b7b9314278c775ec469403b338eb0f5dbd8f..7b6b739b9e823cbe30e932e71bd374fed4718e98 100644 (file)
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -78,6 +78,9 @@ if ($data = data_submitted()) {
     } else {
         error(get_string('confirmsesskeybad', 'error'));
     }
+    //reload site
+    $SITE = get_record('course', 'id', $SITE->id);
+    $COURSE = clone($SITE);
 }
 
 

diff --git a/admin/settings/appearance.php b/admin/settings/appearance.php
index faafac85a0af796c4ea981dc3a7f6412bbdd7886..843092924c0334ad97734544b96a675c357f4f18 100644 (file)
--- a/admin/settings/appearance.php
+++ b/admin/settings/appearance.php
@@ -17,8 +17,8 @@ $ADMIN->add('themes', new admin_externalpage('themeselector', get_string('themes
 
 // "frontpage" settingpage
 $temp = new admin_settingpage('frontpage', get_string('frontpage','admin'));
-$temp->add(new admin_setting_sitesettext('fullname', get_string('fullsitename'), '', '', PARAM_NOTAGS));
-$temp->add(new admin_setting_sitesettext('shortname', get_string('shortsitename'), '', PARAM_NOTAGS));
+$temp->add(new admin_setting_sitesettext('fullname', get_string('fullsitename'), '', ''));
+$temp->add(new admin_setting_sitesettext('shortname', get_string('shortsitename'), '', ''));
 $temp->add(new admin_setting_special_frontpagedesc());
 $temp->add(new admin_setting_courselist_frontpage(false)); // non-loggedin version of the setting (that's what the parameter is for :) )
 $temp->add(new admin_setting_courselist_frontpage(true)); // loggedin version of the setting

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 9163be76dffb48650b7592225fa07512c13157f4..f5c3cb289dfb73b90b42e571181383491a48e12b 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -1663,10 +1663,10 @@ class admin_setting_sitesettext extends admin_setting_configtext {
 
     var $id;
 
-    function admin_setting_sitesettext($name, $visiblename, $description, $defaultsetting, $paramtype=PARAM_RAW) {
+    function admin_setting_sitesettext($name, $visiblename, $description, $defaultsetting) {
 
         $this->id = SITEID;
-        parent::admin_setting_configtext($name, $visiblename, $description, $defaultsetting, $paramtype);
+        parent::admin_setting_configtext($name, $visiblename, $description, $defaultsetting);
 
     }
 
@@ -1675,7 +1675,16 @@ class admin_setting_sitesettext extends admin_setting_configtext {
         return (isset($site->{$this->name}) ? $site->{$this->name} : NULL);
     }
 
+    function validate($data) {
+        $cleaned = clean_param($data, PARAM_NOTAGS);
+        if ($cleaned == '') {
+            return false; // can not be empty
+        }
+        return ("$data" == "$cleaned"); // implicit conversion to string is needed to do exact comparison
+    }
+
     function write_setting($data) {
+        $data = trim($data);
         if (!$this->validate($data)) {
             return get_string('validateerror', 'admin') . $this->visiblename . '<br />';
         }