Version 4.3.0

applications/core/sources/Setup/Upgrade.php

@@ -72,8 +72,9 @@ class _Upgrade
 				{
 					if( $e->getCode() !== 115115 )
 					{
+						/* We don't want to stop upgrader for this, but we can show the message if the upgrader otherwise cannot continue */
 						$fileSystemItems[ $class->configurationId ] = array(
-							'success'	=> FALSE,
+							'success'	=> TRUE,
 							'message'	=> $e->getMessage()
 						);
 					}
@@ -132,6 +133,18 @@ class _Upgrade
 			);
 		}
 
+		/* MySQL timeouts */
+		$db = $db ?: \IPS\Db::i();
+		$query = $db->query( "SHOW VARIABLES LIKE '%wait_timeout%'" );
+
+		while( $row = $query->fetch_assoc() )
+		{
+			if ( $row['Variable_name'] == 'wait_timeout' AND $row['Value'] < 20 )
+			{
+				$return['advice'][] = \IPS\Member::loggedIn()->language()->addToStack( 'requirements_mysql_timeout', FALSE, array( 'sprintf' => array( $row['Variable_name'], $row['Value'] ) ) );
+			}
+		}
+
 		return $return;
 	}
 	
@@ -885,10 +898,7 @@ class _Upgrade
 	 */
 	protected function step9( $data )
 	{
-		if( isset( \IPS\Data\Store::i()->settings ) )
-		{
-			unset( \IPS\Data\Store::i()->settings );
-		}
+		\IPS\Settings::i()->clearCache();
 
 		if( isset( \IPS\Data\Store::i()->storageConfigurations ) ) 
 		{
@@ -942,7 +952,7 @@ class _Upgrade
 				$data[2] = 0;
 			}
 
-			$inserted = \IPS\Application::load( $app )->installJavascript( $data[2], 150 );
+			$inserted = \IPS\Application::load( $app )->installJavascript( $data[2], 100 );
 			
 			\IPS\Log::debug( "Installed javascript for " . $app, 'upgrade' );
 
@@ -1002,8 +1012,7 @@ class _Upgrade
 			\IPS\Db::i()->insert( 'core_sys_conf_settings', $insert );
 		}
 		
-		\IPS\Db::i()->update( 'core_sys_conf_settings', array( 'conf_value' => intval( $value ) ), array( 'conf_key=?', 'setup_in_progress' ) );
-		unset( \IPS\Data\Store::i()->settings );
+		\IPS\Settings::i()->changeValues( array( 'setup_in_progress' => intval( $value ) ) );
 	}
 	
 	 /**
@@ -1193,8 +1202,22 @@ class _Upgrade
 			if( class_exists( $classname ) )
 			{
 				$extension = new $classname;
-												
-				\IPS\Task::queue( 'core', 'RepairFileUrls', array( 'storageExtension' => $k, 'count' => $extension->count() ), 1 );
+
+				try
+				{
+					\IPS\Task::queue( 'core', 'RepairFileUrls', array( 'storageExtension' => $k, 'count' => $extension->count() ), 1 );
+				}
+				catch ( \IPS\Db\Exception $e )
+				{
+					/*
+					 * Don't throw an exception if the table or a column doesn't exist, this can happen
+					 * when newer versions add storage configurations that haven't been set up yet.
+					 */
+					if( $e->getCode() !== 1146 AND $e->getCode() !== 1054 )
+					{
+						throw $e;
+					}
+				}
 			}
 		}
 	}