From: tjhunt <tjhunt>
Date: Fri, 12 Jan 2007 18:30:27 +0000 (+0000)
Subject: Fix notices from admin_setting_configmultiselect when no options are selected.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=d7933a55c8c057b07589cd4c32b78324bba554d6;p=moodle.git

Fix notices from admin_setting_configmultiselect when no options are selected.
---

diff --git a/lib/adminlib.php b/lib/adminlib.php
index e08cb5f66d..a03044b3a4 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -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 />';