Merge branch 'w51_MDL-37128_m25_rssrestore' of git://github.com/skodak/moodle

2013-01-07 13:56:57 +08:00
parent 8057d3ee77 3d89a36a85
commit 5083fe2194
1 changed files with 3 additions and 0 deletions
@@ -78,6 +78,9 @@ class restore_rss_client_block_structure_step extends restore_structure_step {
        $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