Merge branch 'w04_MDL-31238_m23_php54' of git://github.com/skodak/moodle

tombola · Jan 24, 2012 · 9a50502 · 9a50502
2 parents 5f67e1f + 820a818
commit 9a50502
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/lib/enrollib.php b/lib/enrollib.php
@@ -1039,10 +1039,7 @@ public function get_description_text($instance) {
     protected function load_config() {
         if (!isset($this->config)) {
             $name = $this->get_name();
-            if (!$config = get_config("enrol_$name")) {
-                $config = new stdClass();
-            }
-            $this->config = $config;
+            $this->config = get_config("enrol_$name");
         }
     }
 

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
@@ -1318,7 +1318,7 @@ function get_config($plugin, $name = NULL) {
         if ($localcfg) {
             return (object)$localcfg;
         } else {
-            return null;
+            return new stdClass();
         }
 
     } else {

diff --git a/lib/simpletest/testfilterconfig.php b/lib/simpletest/testfilterconfig.php
@@ -747,7 +747,7 @@ public function test_filter_delete_all_for_filter() {
         $expectedconfig = new stdClass;
         $expectedconfig->configname = 'Other config value';
         $this->assertEqual($expectedconfig, get_config('filter_other'));
-        $this->assertNull(get_config('filter_name'));
+        $this->assertIdentical(get_config('filter_name'), new stdClass());
     }
 
     public function test_filter_delete_all_for_context() {

diff --git a/message/lib.php b/message/lib.php
@@ -2347,11 +2347,7 @@ function get_message_processor($type) {
  * @return object $processors object containing information on message processors
  */
 function get_message_output_default_preferences() {
-    $preferences = get_config('message');
-    if (!$preferences) {
-        $preferences = new stdClass();
-    }
-    return $preferences;
+    return get_config('message');
 }
 
 /**