Version 4.1.2

admin/upgrade/html/forms/queries.phtml

@@ -6,7 +6,8 @@
 	<pre class="ipsCode prettyprint lang-sql">{$query}{{if mb_substr( $query, -1 ) != ';'}};{{endif}}</pre>
 {{endforeach}}
 <div class="ipsAreaBackground ipsPad ipsType_center">
-	<a href="{$url->setQueryString( array( 'key' => $_SESSION['uniqueKey'], 'mr_continue' => NULL, 'run_anyway' => 1, 'mr' => \IPS\Request::i()->mr ) )}" data-action="redirectContinue" class="ipsButton ipsButton_primary">{lang="manual_query_auto"}</a>
+	{{$mr = \IPS\core\Setup\Upgrade::adjustMultipleRedirect( array( 'extra' => array( 'lastSqlId' => $_SESSION['lastJsonIndex'] - 0.1 ) ) );}}
+	<a href="{$url->setQueryString( array( 'key' => $_SESSION['uniqueKey'], 'mr_continue' => NULL, 'run_anyway' => 1, 'mr' => $mr ) )}" data-action="redirectContinue" class="ipsButton ipsButton_primary">{lang="manual_query_auto"}</a>
 	&nbsp;{lang="or"}&nbsp;
 	<a href="{$url}" data-action="redirectContinue" class="ipsButton ipsButton_primary">{lang="manual_query_manual"}</a>
 </div>

admin/upgrade/html/global/globalTemplate.phtml

@@ -21,7 +21,7 @@
 		<script src="js/multipleRedirect.js"></script>
 	</head>
 	<body class='ipsApp ipsApp_installer'>
-		<!-- Nulled by IAF -->
+		
 		<div id='elInstaller_wrap'>
 			<div id='ipsLayout_header' class='ipsClearfix' role='banner'>
 				<header>
@@ -59,6 +59,7 @@
 						</p>
 						<br><br>
 						<a href='{expression="\IPS\Settings::i()->base_url"}' class='ipsButton ipsButton_large ipsButton_primary'>Go to the suite</a>
+						<a href='{expression="rtrim( \IPS\Settings::i()->base_url, '/' ) . '/' . \IPS\CP_DIRECTORY"}' class='ipsButton ipsButton_large ipsButton_normal'>Go to the AdminCP</a>
 						<br><br>
 						<a href="{expression="\IPS\Http\Url::ips('docs/docs')"}" target="_blank">Suite Documentation</a>
 					</div>
@@ -80,7 +81,6 @@
 						<a href="{expression="\IPS\Http\Url::ips('docs/install_guide')"}" target="_blank">Install Guide</a>
 					</div>
 				{{endif}}
-				<p style="text-align: right">Nulled by IAF</p>
 			</main>
 		</div>
 	</body>

admin/upgrade/html/global/healthcheck.phtml

@@ -28,8 +28,8 @@
 		<br><br>
 		<p class="ipsType_normal">None of these items are required in order to continue with the upgrade right now. However, they will be required in a future version of IPS Community Suite. You should make a note of them and contact your hosting provider or system administrator after the upgrade to address them. You can re-run these checks later from the <em>Support</em> section of the Administrator Control Panel.</p>
 		<ul class="ipsPad ipsType_large ipsList_checks">
-			{{foreach $requirements['advice'] as $item}}
-				<li class="advisory">{$item}</li>
+			{{foreach $requirements['advice'] as $key => $item}}
+				<li class="{{if $key === 'php'}}ipsMessage ipsMessage_warning{{else}}advisory{{endif}}">{$item}</li>
 			{{endforeach}}
 		</ul>
 	{{endif}}