Version 4.6.0

applications/forums/setup/upg_105013/upgrade.php

@@ -30,6 +30,12 @@ class _Upgrade
 	 */
 	public function step1()
 	{
+		/* Make sure we have the table first */
+		if( !\IPS\Db::i()->checkForTable('forums_rss_import') )
+		{
+			return TRUE;
+		}
+
 		/* Move over forums_rss_import to core_rss_import */
 		foreach( \IPS\Db::i()->select( '*', 'forums_rss_import' ) as $rss )
 		{
@@ -48,8 +54,8 @@ class _Upgrade
 				'rss_import_topic_pre' => $rss['rss_import_topic_pre'],
 				'rss_import_auto_follow' => $rss['rss_import_auto_follow'],
 				'rss_import_settings' => json_encode( array(
-					'rss_import_topic_open' => $rss['rss_import_topic_open'],
-					'rss_import_topic_hide' => $rss['rss_import_topic_hide']
+					'topic_open' => $rss['rss_import_topic_open'],
+					'topic_hide' => $rss['rss_import_topic_hide']
 				) )
 			) );
 			
@@ -60,7 +66,7 @@ class _Upgrade
 				
 				\IPS\Db::i()->query( "INSERT INTO " . \IPS\Db::i()->prefix . "core_rss_imported
 					(rss_imported_guid, rss_imported_content_id, rss_imported_import_id )
-					( SELECT a.rss_imported_guid, a.rss_imported_tid, {$newImportId} FROM " . \IPS\Db::i()->prefix . "forums_rss_imported a)" );
+					( SELECT a.rss_imported_guid, a.rss_imported_tid, {$newImportId} FROM " . \IPS\Db::i()->prefix . "forums_rss_imported a WHERE a.rss_imported_impid={$rss['rss_import_id']})" );
 			}
 			catch( \Exception $e ) { }
 		}
@@ -94,7 +100,10 @@ class _Upgrade
 		 ) ), 'forums' ) );
 
 		/* Delete old RSS Table */
-		\IPS\Db::i()->dropTable( array( 'forums_rss_import', 'forums_rss_imported' ) );
+		if( \IPS\Db::i()->checkForTable('forums_rss_import') )
+		{
+			\IPS\Db::i()->dropTable( array( 'forums_rss_import', 'forums_rss_imported' ) );
+		}
 		
 		/* Kick off solve index build */
 		\IPS\Task::queue( 'forums', 'RebuildSolvedIndex', array(), 4 );