X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FOutputPage.php;h=b6a8d246d92fb6c783ad2f6e702797cac25c10d8;hb=2e29ebf8a362d11c0b80ff99a7338e22401776e6;hp=2c4c64ee1167a5058802e413c58cee6b5d69105d;hpb=de54bc91e3dafc73cc7dde3ea151a2b87eae66ac;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 2c4c64ee11..b6a8d246d9 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -447,8 +447,8 @@ class OutputPage extends ContextSource {
 			if ( $module instanceof ResourceLoaderModule
 				&& $module->getOrigin() <= $this->getAllowedModules( $type )
 				&& ( is_null( $position ) || $module->getPosition() == $position )
-				&& ( !$this->mTarget || in_array( $this->mTarget, $module->getTargets() ) ) )
-			{
+				&& ( !$this->mTarget || in_array( $this->mTarget, $module->getTargets() ) )
+			) {
 				$filteredModules[] = $val;
 			}
 		}
@@ -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(
@@ -891,7 +887,10 @@ class OutputPage extends ContextSource {
 		$this->mPagetitle = $nameWithTags;
 
 		# change "<i>foo&amp;bar</i>" to "foo&bar"
-		$this->setHTMLTitle( $this->msg( 'pagetitle' )->rawParams( Sanitizer::stripAllTags( $nameWithTags ) ) );
+		$this->setHTMLTitle(
+			$this->msg( 'pagetitle' )->rawParams( Sanitizer::stripAllTags( $nameWithTags ) )
+				->inContentLanguage()
+		);
 	}
 
 	/**
@@ -2485,10 +2484,10 @@ $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() ) );
+			$this->setHTMLTitle( $this->msg( 'pagetitle', $this->getPageTitle() )->inContentLanguage() );
 		}
 
 		$openHead = Html::openElement( 'head' );