Version 4.5.0

applications/core/modules/setup/upgrade/continueupgrade.php

@@ -11,7 +11,7 @@
 namespace IPS\core\modules\setup\upgrade;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -30,9 +30,16 @@ class _continueupgrade extends \IPS\Dispatcher\Controller
 	public function manage()
 	{
 		/* Best check for the upgrade file first */
-		$json = json_decode( @file_get_contents( \IPS\ROOT_PATH . '/uploads/logs/upgrader_data.cgi' ), TRUE );
+		try
+		{
+			$json = json_decode( \IPS\Db::i()->select( 'upgrade_data', 'upgrade_temp' )->first(), TRUE );
+		}
+		catch( \UnderflowException $e )
+		{
+			$json = NULL;
+		}
 			
-		if ( is_array( $json ) and isset( $json['session'] ) and isset( $json['data'] ) )
+		if ( \is_array( $json ) and isset( $json['session'] ) and isset( $json['data'] ) )
 		{
 			$url = \IPS\Http\Url::internal( "controller=upgrade" )->setQueryString( 'key', $_SESSION['uniqueKey'] );