Version 4.3.0

applications/core/setup/upg_101000/options.php

@@ -66,7 +66,19 @@ if ( $application->long_version >= 40000 and !\IPS\NO_WRITES )
 			if ( $plugin->enabled )
 			{
 				$plugin->enabled = FALSE;
-				$plugin->save();
+
+				try
+				{
+					$plugin->save();
+				}
+				catch( \IPS\Db\Exception $e )
+				{
+					/* Column may be missing from a table, i.e. upgrading from an old version where set_cache_key doesn't exist */
+					if( $e->getCode() != 1054 )
+					{
+						throw $e;
+					}
+				}
 
 				$disabledPluginNames[] = $plugin->_title;
 			}

applications/core/setup/upg_101000/upgrade.php

@@ -69,7 +69,7 @@ class _Upgrade
 	public function step2()
 	{
 		\IPS\Db::i()->update( 'core_sys_conf_settings', array( 'conf_value' => \IPS\Settings::i()->email_in ), "conf_key = 'upgrade_email'" );
-		unset( \IPS\Data\Store::i()->settings );
+		\IPS\Settings::i()->clearCache();
 
 		return TRUE;
 	}
@@ -169,7 +169,7 @@ class _Upgrade
 	public function step5()
 	{
 		/* Init */
-		$perCycle	= 250;
+		$perCycle	= 500;
 		$did		= 0;
 		$limit		= intval( \IPS\Request::i()->extra );
 		
@@ -311,7 +311,7 @@ class _Upgrade
 			/* And update */
 			\IPS\Db::i()->update( 'core_sys_conf_settings', array( 'conf_value' => $host ), "conf_key = 'smtp_host'" );
 			\IPS\Db::i()->update( 'core_sys_conf_settings', array( 'conf_value' => $protocol ), "conf_key = 'smtp_protocol'" );
-			unset( \IPS\Data\Store::i()->settings );
+			\IPS\Settings::i()->clearCache();
 		}
 
 		return TRUE;