Merge branch 'w51_MDL-37128_m25_rssrestore' of git://github.com/skoda…

…k/moodle
alseambusher · Jan 7, 2013 · 5083fe2 · 5083fe2
2 parents 8057d3e + 3d89a36
commit 5083fe2
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/blocks/rss_client/backup/moodle2/restore_rss_client_stepslib.php b/blocks/rss_client/backup/moodle2/restore_rss_client_stepslib.php
@@ -78,6 +78,9 @@ public function process_block($data) {
         $configdata = $DB->get_field('block_instances', 'configdata', array('id' => $this->task->get_blockid()));
         // Extract configdata
         $config = unserialize(base64_decode($configdata));
+        if (empty($config)) {
+            $config = new stdClass();
+        }
         // Set array of used rss feeds
         $config->rssid = $feedsarr;
         // Serialize back the configdata