Merge remote branch 'origin/develop' into develop

exponentcms · Apr 28, 2011 · 1d44f25 · 1d44f25
2 parents 013d423 + bdd7f12
commit 1d44f25
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/framework/modules/migration/controllers/migrationController.php b/framework/modules/migration/controllers/migrationController.php
@@ -777,6 +777,8 @@ private function convert($iloc, $module, $hc=0) {
 						$config['enable_rss'] = true;
 						$config['feed_title'] = $oldconfig->feed_title;
 						$config['feed_desc'] = $oldconfig->feed_desc;
+						$config['rss_limit'] = isset($oldconfig->rss_limit) ? $oldconfig->rss_limit : 24;
+						$config['rss_cachetime'] = isset($oldconfig->rss_cachetime) ? $oldconfig->rss_cachetime : 1440;
 						$newconfig = new expConfig();
 						$newconfig->config = $config;
 						$newconfig->location_data = $loc;
@@ -894,6 +896,8 @@ private function convert($iloc, $module, $hc=0) {
 						$config['enable_rss'] = true;
 						$config['feed_title'] = $oldconfig->feed_title;
 						$config['feed_desc'] = $oldconfig->feed_desc;
+						$config['rss_limit'] = isset($oldconfig->rss_limit) ? $oldconfig->rss_limit : 24;
+						$config['rss_cachetime'] = isset($oldconfig->rss_cachetime) ? $oldconfig->rss_cachetime : 1440;
 						$newconfig->config = $config;
 						$newrss = new expRss();
 						$newrss->module = $loc->mod;
@@ -960,6 +964,8 @@ private function convert($iloc, $module, $hc=0) {
 						$config['enable_rss'] = true;
 						$config['feed_title'] = $oldconfig->feed_title;
 						$config['feed_desc'] = $oldconfig->feed_desc;
+						$config['rss_limit'] = isset($oldconfig->rss_limit) ? $oldconfig->rss_limit : 24;
+						$config['rss_cachetime'] = isset($oldconfig->rss_cachetime) ? $oldconfig->rss_cachetime : 1440;
 						$newconfig = new expConfig();
 						$newconfig->config = $config;
 						$newconfig->location_data = $loc;
@@ -1164,6 +1170,8 @@ private function convert($iloc, $module, $hc=0) {
 						$config['enable_rss'] = true;
 						$config['feed_title'] = $oldconfig->feed_title;
 						$config['feed_desc'] = $oldconfig->feed_desc;
+						$config['rss_limit'] = isset($oldconfig->rss_limit) ? $oldconfig->rss_limit : 24;
+						$config['rss_cachetime'] = isset($oldconfig->rss_cachetime) ? $oldconfig->rss_cachetime : 1440;
 						$newconfig = new expConfig();
 						$newconfig->config = $config;
 						$newconfig->location_data = $loc;