From d160a5db4a6c248072ea205bdeed1c4ac400fdae Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sat, 21 Jan 2012 11:15:30 +0100 Subject: [PATCH] MDL-31238 remove now unnecessary null to stdClass conversion for plugin settings --- lib/enrollib.php | 5 +---- message/lib.php | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/enrollib.php b/lib/enrollib.php index 991fb1c8221..0b5e701d13a 100644 --- a/lib/enrollib.php +++ b/lib/enrollib.php @@ -950,10 +950,7 @@ abstract class enrol_plugin { 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/message/lib.php b/message/lib.php index 656326bc90b..181410461d1 100644 --- a/message/lib.php +++ b/message/lib.php @@ -2345,11 +2345,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'); } /**