Version 4.2.0

applications/core/setup/upg_33012/upgrade.php

@@ -1,12 +1,11 @@
 <?php
 /**
  * @brief		Upgrade steps
- * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Community Suite
+ * @author		<a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) Invision Power Services, Inc.
+ * @license		https://www.invisioncommunity.com/legal/standards/
+ * @package		Invision Community
  * @since		4 Jun 2014
- * @version		SVN_VERSION_NUMBER
  */
 
 namespace IPS\core\setup\upg_33012;
@@ -52,14 +51,6 @@ class _Upgrade
 			\IPS\Db::i()->dropColumn( 'core_sys_module', 'core_sys_module' );
 		}
 
-		/* New blog column */
-		$addBlogColumn	= false;
-
-		if( !\IPS\Db::i()->checkForColumn( 'members', 'blogs_recache' ) )
-		{
-			$addBlogColumn	= true;
-		}
-
 		\IPS\Db::i()->changeColumn( 'cache_store', 'cs_value', array(
 			'name'			=> 'cs_value',
 			'type'			=> 'mediumtext',
@@ -113,6 +104,24 @@ class _Upgrade
 
 		\IPS\Db::i()->query( "INSERT INTO " . \IPS\Db::i()->prefix . "reputation_totals SELECT MD5( CONCAT( app, ';', type, ';', type_id) ), MD5( CONCAT( app, ';', type ) ), SUM(rep_rating), type_id FROM " . \IPS\Db::i()->prefix . "reputation_index GROUP BY app, type, type_id ON DUPLICATE KEY UPDATE rt_key=rt_key" );
 
+		return TRUE;
+	}
+
+	/**
+	 * Step 2
+	 *
+	 * @return	array	If returns TRUE, upgrader will proceed to next step. If it returns any other value, it will set this as the value of the 'extra' GET parameter and rerun this step (useful for loops)
+	 */
+	public function step2()
+	{
+		/* New blog column */
+		$addBlogColumn	= false;
+
+		if( !\IPS\Db::i()->checkForColumn( 'members', 'blogs_recache' ) )
+		{
+			$addBlogColumn	= true;
+		}
+
 		$queries = array( array(
 			'table' => 'message_posts',
 			'query' => "ALTER TABLE " . \IPS\Db::i()->prefix . "message_posts ADD INDEX msg_author_id (msg_author_id);"
@@ -139,7 +148,7 @@ class _Upgrade
 		
 		if ( count( $toRun ) )
 		{
-			\IPS\core\Setup\Upgrade::adjustMultipleRedirect( array( 1 => 'core', 'extra' => array( '_upgradeStep' => 2 ) ) );
+			\IPS\core\Setup\Upgrade::adjustMultipleRedirect( array( 1 => 'core', 'extra' => array( '_upgradeStep' => 3 ) ) );
 
 			/* Queries to run manually */
 			return array( 'html' => \IPS\Theme::i()->getTemplate( 'forms' )->queries( $toRun, \IPS\Http\Url::internal( 'controller=upgrade' )->setQueryString( array( 'key' => $_SESSION['uniqueKey'], 'mr_continue' => 1, 'mr' => \IPS\Request::i()->mr ) ) ) );