2 files changed, 2 insertions, 9 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 0ea6eeffd7..f367ae1fc0 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -211,13 +211,6 @@ while (!$migrator->finished())
 		phpbb_end_update($cache, $config);
 	}
 
-	$state = array_merge(array(
-			'migration_schema_done' => false,
-			'migration_data_done'	=> false,
-		),
-		$migrator->last_run_migration['state']
-	);
-
 	// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
 	if ((time() - $update_start_time) >= $safe_time_limit)
 	{
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index bb3a74ee5e..8e57ed3edd 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -151,10 +151,10 @@ class install_install extends module
 			'LEGEND_EXPLAIN'	=> $lang['PHP_SETTINGS_EXPLAIN'],
 		));
 
-		// Test the minimum PHP version
+		// Test the minimum and maximum version of PHP
 		$php_version = PHP_VERSION;
 
-		if (version_compare($php_version, '5.3.3') < 0)
+		if ((version_compare($php_version, '5.3.3') < 0) || (version_compare($php_version, '7.0.0-dev', '>=')))
 		{
 			$result = '<strong style="color:red">' . $lang['NO'] . '</strong>';
 		}