]> git.mjollnir.org Git - moodle.git/commitdiff
Fix notices from admin_setting_configmultiselect when no options are selected.
authortjhunt <tjhunt>
Fri, 12 Jan 2007 18:30:27 +0000 (18:30 +0000)
committertjhunt <tjhunt>
Fri, 12 Jan 2007 18:30:27 +0000 (18:30 +0000)
lib/adminlib.php

index e08cb5f66d9c0aa9fae663b677a8aea27957dbf1..a03044b3a4950f703c3d73f1b6d4966e8df67589 100644 (file)
@@ -1491,10 +1491,21 @@ class admin_setting_configmultiselect extends admin_setting_configselect {
 
     function get_setting() {
         global $CFG;
-        return (isset($CFG->{$this->name}) ? explode(',', $CFG->{$this->name}) : NULL);;
+        if (isset($CFG->{$this->name})) {
+            if ($CFG->{$this->name}) {
+                return explode(',', $CFG->{$this->name});
+            } else {
+                return array();
+            }            
+        } else {
+            return NULL;
+        }
     }
 
     function write_setting($data) {
+        if (empty($data)) {
+            $data = array();
+        }
         foreach ($data as $datum) {
             if (! in_array($datum, array_keys($this->choices))) {
                 return get_string('errorsetting', 'admin') . $this->visiblename . '<br />';