Version 4.1.19.4

applications/core/setup/upg_101090/upgrade.php

@@ -25,28 +25,11 @@ class _Upgrade
 {
 	/**
 	 * Step 1
-	 * Fix announcements
-	 *
-	 * @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 step1()
-	{
-		if ( \IPS\Db::i()->select( 'COUNT(*)', 'core_announcements', 'announce_active=1' )->first() )
-		{
-			\IPS\Db::i()->update( 'core_sys_conf_settings', array( 'conf_value' => 1 ), array( 'conf_key=?', 'announcements_exist' ) );
-			unset( \IPS\Data\Store::i()->settings );
-		}
-
-		return true;
-	}
-
-	/**
-	 * Step 2
 	 * Remove bulk mail task
 	 *
 	 * @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()
+	public function step1()
 	{
 		\IPS\Db::i()->delete('core_tasks', array('`key`=? and app=?', 'bulkmail', 'core' ) );
 
@@ -54,12 +37,12 @@ class _Upgrade
 	}
 
 	/**
-	 * Step 3
+	 * Step 2
 	 * Fix core_menu items
 	 *
 	 * @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 step3()
+	public function step2()
 	{
 		\IPS\Db::i()->update( 'core_menu', array( 'is_menu_child' => 0 ), array( 'parent IS NULL' ) );
 		unset( \IPS\Data\Store::i()->frontNavigation );
@@ -68,12 +51,12 @@ class _Upgrade
 	}
 
 	/**
-	 * Step 4
+	 * Step 3
 	 * Fix admin permissions - remove not existing groups
 	 *
 	 * @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 step4()
+	public function step3()
 	{
 		\IPS\Db::i()->delete( 'core_admin_permission_rows', array( 'row_id_type=? AND ' . \IPS\Db::i()->in( 'row_id', iterator_to_array( \IPS\Db::i()->select('g_id', 'core_groups' ) ), TRUE ), 'group' ) );
 		unset ( \IPS\Data\Store::i()->administrators );