From: Max Semenik <maxsem@users.mediawiki.org>
Date: Tue, 22 Feb 2011 17:15:48 +0000 (+0000)
Subject: Follow-up r82504: use JS redirection only for IE, I don't like how it looks at least... 
X-Git-Tag: 1.31.0-rc.0~31827
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=82965883a4f1d20747b5071b0f12b5ed49ad9bd2;p=lhc%2Fweb%2Fwiklou.git

Follow-up r82504: use JS redirection only for IE, I don't like how it looks at least in Opera (sometimes images are not loaded)
---

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index b225ec748b..e166dd36d7 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -1060,9 +1060,13 @@ class WebInstaller_Complete extends WebInstallerPage {
 		// Pop up a dialog box, to make it difficult for the user to forget
 		// to download the file
 		$lsUrl = $GLOBALS['wgServer'] . $this->parent->getURL( array( 'localsettings' => 1 ) );
-		$this->addHtml( '<script type="' . $GLOBALS['wgJsMimeType'] . '">jQuery( document ).ready( function() { document.location='
-			. Xml::encodeJsVar( $lsUrl) . "; } );</script>\n" );
-		// JS appears the only method that works consistently with IE7+
+		if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !== false ) {
+			// JS appears the only method that works consistently with IE7+
+			$this->addHtml( "\n<script type=\"" . $GLOBALS['wgJsMimeType'] . '">jQuery( document ).ready( function() { document.location='
+				. Xml::encodeJsVar( $lsUrl) . "; } );</script>\n" );
+		} else {
+			$this->parent->request->response()->header( "Refresh: 0;url=$lsUrl" );
+		}
 
 		$this->startForm();
 		$this->parent->disableLinkPopups();