X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FOutputPage.php;h=9866e2cd2eeb49970b1a5d88ee4e210b3440a525;hb=eabfeda3bec5d8108bddf143cf677aa301d8073b;hp=a0d7e30c97c5537317b5f89f9afe75e0cabe26cb;hpb=665f171a18061aacd339102a21f32d714c5de50d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index a0d7e30c97..9866e2cd2e 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -687,10 +687,6 @@ class OutputPage extends ContextSource {
 			wfDebug( __METHOD__ . ": CACHE DISABLED\n", false );
 			return false;
 		}
-		if ( $this->getUser()->getOption( 'nocache' ) ) {
-			wfDebug( __METHOD__ . ": USER DISABLED CACHE\n", false );
-			return false;
-		}
 
 		$timestamp = wfTimestamp( TS_MW, $timestamp );
 		$modifiedTimes = array(
@@ -2488,7 +2484,7 @@ $templates
 		$userdir = $this->getLanguage()->getDir();
 		$sitedir = $wgContLang->getDir();
 
-		$ret = Html::htmlHeader( array( 'lang' => $this->getLanguage()->getHtmlCode(), 'dir' => $userdir, 'class' => 'client-nojs' ) );
+		$ret = Html::htmlHeader( $sk->getHtmlElementAttributes() );
 
 		if ( $this->getHTMLTitle() == '' ) {
 			$this->setHTMLTitle( $this->msg( 'pagetitle', $this->getPageTitle() )->inContentLanguage() );
@@ -2514,6 +2510,10 @@ $templates
 
 		$ret .= Html::element( 'title', null, $this->getHTMLTitle() ) . "\n";
 
+		// Avoid Internet Explorer "compatibility view", so that
+		// jQuery can work correctly.
+		$ret .= Html::element( 'meta', array( 'http-equiv' => 'X-UA-Compatible', 'content' => 'IE=EDGE' ) );
+
 		$ret .= implode( "\n", array(
 			$this->getHeadLinks(),
 			$this->buildCssLinks(),