Permalink
Browse files

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

…k/moodle into MOODLE_24_STABLE
  • Loading branch information...
2 parents c5e96ad + 6021500 commit 850aa189e48d74f0f82fe7e1094c64df88e64637 @danpoltawski danpoltawski committed Jan 7, 2013
Showing with 3 additions and 0 deletions.
  1. +3 −0 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

0 comments on commit 850aa18

Please sign in to comment.