Merged MDL-9139 from 1.8

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 2aba9e90347753e3eb8440cd9ef4ccc2906d09b2..a14b873e83839b7781a42c47f9dc95ceadf184aa 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -2468,6 +2468,8 @@ class admin_setting_special_coursemanager extends admin_setting {
                 $array[$roleid] = 1;  
             }
             return $array;
+        } else if (isset($CFG->{$this->name})) {
+            return array();
         } else {
             return null;
         }