X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FOutputPage.php;h=97165b46130401a79695f4333d9fbaaa030da419;hb=fef14bdbe6c11ef26202e4da3aca10434cf56df1;hp=78eb458c4ff8e8d0dc510a11483f749e9b7cdc67;hpb=81b038b520812c70f8f74187cfdf23b0323edebc;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 78eb458c4f..97165b4613 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -229,9 +229,6 @@ class OutputPage extends ContextSource {
 	/** @var string */
 	private $mPageTitleActionText = '';
 
-	/** @var array */
-	private $mParseWarnings = array();
-
 	/** @var int Cache stuff. Looks like mEnableClientCache */
 	protected $mCdnMaxage = 0;
 	/** @var int Upper limit on mCdnMaxage */
@@ -816,7 +813,7 @@ class OutputPage extends ContextSource {
 
 		$clientHeader = $this->getRequest()->getHeader( 'If-Modified-Since' );
 		if ( $clientHeader === false ) {
-			wfDebug( __METHOD__ . ": client did not send If-Modified-Since header\n", 'log' );
+			wfDebug( __METHOD__ . ": client did not send If-Modified-Since header", 'private' );
 			return false;
 		}
 
@@ -845,17 +842,17 @@ class OutputPage extends ContextSource {
 		}
 
 		wfDebug( __METHOD__ . ": client sent If-Modified-Since: " .
-			wfTimestamp( TS_ISO_8601, $clientHeaderTime ) . "\n", 'log' );
+			wfTimestamp( TS_ISO_8601, $clientHeaderTime ), 'private' );
 		wfDebug( __METHOD__ . ": effective Last-Modified: " .
-			wfTimestamp( TS_ISO_8601, $maxModified ) . "\n", 'log' );
+			wfTimestamp( TS_ISO_8601, $maxModified ), 'private' );
 		if ( $clientHeaderTime < $maxModified ) {
-			wfDebug( __METHOD__ . ": STALE, $info\n", 'log' );
+			wfDebug( __METHOD__ . ": STALE, $info", 'private' );
 			return false;
 		}
 
 		# Not modified
 		# Give a 304 Not Modified response code and disable body output
-		wfDebug( __METHOD__ . ": NOT MODIFIED, $info\n", 'log' );
+		wfDebug( __METHOD__ . ": NOT MODIFIED, $info", 'private' );
 		ini_set( 'zlib.output_compression', 0 );
 		$this->getRequest()->response()->statusHeader( 304 );
 		$this->sendCacheControl();
@@ -1773,7 +1770,6 @@ class OutputPage extends ContextSource {
 		$this->mNewSectionLink = $parserOutput->getNewSection();
 		$this->mHideNewSectionLink = $parserOutput->getHideNewSection();
 
-		$this->mParseWarnings = $parserOutput->getWarnings();
 		if ( !$parserOutput->isCacheable() ) {
 			$this->enableClientCache( false );
 		}
@@ -2184,7 +2180,7 @@ class OutputPage extends ContextSource {
 					# We'll purge the proxy cache explicitly, but require end user agents
 					# to revalidate against the proxy on each visit.
 					# Surrogate-Control controls our CDN, Cache-Control downstream caches
-					wfDebug( __METHOD__ . ": proxy caching with ESI; {$this->mLastModified} **\n", 'log' );
+					wfDebug( __METHOD__ . ": proxy caching with ESI; {$this->mLastModified} **", 'private' );
 					# start with a shorter timeout for initial testing
 					# header( 'Surrogate-Control: max-age=2678400+2678400, content="ESI/1.0"');
 					$response->header( 'Surrogate-Control: max-age=' . $config->get( 'SquidMaxage' )
@@ -2195,7 +2191,7 @@ class OutputPage extends ContextSource {
 					# to revalidate against the proxy on each visit.
 					# IMPORTANT! The CDN needs to replace the Cache-Control header with
 					# Cache-Control: s-maxage=0, must-revalidate, max-age=0
-					wfDebug( __METHOD__ . ": local proxy caching; {$this->mLastModified} **\n", 'log' );
+					wfDebug( __METHOD__ . ": local proxy caching; {$this->mLastModified} **", 'private' );
 					# start with a shorter timeout for initial testing
 					# header( "Cache-Control: s-maxage=2678400, must-revalidate, max-age=0" );
 					$response->header( 'Cache-Control: s-maxage=' . $this->mCdnMaxage
@@ -2204,7 +2200,7 @@ class OutputPage extends ContextSource {
 			} else {
 				# We do want clients to cache if they can, but they *must* check for updates
 				# on revisiting the page.
-				wfDebug( __METHOD__ . ": private caching; {$this->mLastModified} **\n", 'log' );
+				wfDebug( __METHOD__ . ": private caching; {$this->mLastModified} **", 'private' );
 				$response->header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', 0 ) . ' GMT' );
 				$response->header( "Cache-Control: private, must-revalidate, max-age=0" );
 			}
@@ -2212,7 +2208,7 @@ class OutputPage extends ContextSource {
 				$response->header( "Last-Modified: {$this->mLastModified}" );
 			}
 		} else {
-			wfDebug( __METHOD__ . ": no caching **\n", 'log' );
+			wfDebug( __METHOD__ . ": no caching **", 'private' );
 
 			# In general, the absence of a last modified header should be enough to prevent
 			# the client from using its cache. We send a few other things just to make sure.
@@ -2338,15 +2334,6 @@ class OutputPage extends ContextSource {
 		print $ins;
 	}
 
-	/**
-	 * Produce a "user is blocked" page.
-	 * @deprecated since 1.18
-	 */
-	function blockedPage() {
-		wfDeprecated( __METHOD__, '1.18' );
-		throw new UserBlockedError( $this->getUser()->mBlock );
-	}
-
 	/**
 	 * Prepare this object to display an error page; disable caching and
 	 * indexing, clear the current text and redirect, set the page's title
@@ -2488,17 +2475,6 @@ class OutputPage extends ContextSource {
 		$this->returnToMain();
 	}
 
-	/**
-	 * Display an error page noting that a given permission bit is required.
-	 * @deprecated since 1.18, just throw the exception directly
-	 * @param string $permission Key required
-	 * @throws PermissionsError
-	 */
-	public function permissionRequired( $permission ) {
-		wfDeprecated( __METHOD__, '1.18' );
-		throw new PermissionsError( $permission );
-	}
-
 	/**
 	 * Format a list of error messages
 	 *
@@ -3953,20 +3929,6 @@ class OutputPage extends ContextSource {
 		$this->addWikiText( $s );
 	}
 
-	/**
-	 * Include jQuery core. Use this to avoid loading it multiple times
-	 * before we get a usable script loader.
-	 *
-	 * @param array $modules List of jQuery modules which should be loaded
-	 * @return array The list of modules which were not loaded.
-	 * @since 1.16
-	 * @deprecated since 1.17
-	 */
-	public function includeJQuery( array $modules = array() ) {
-		wfDeprecated( __METHOD__, '1.17' );
-		return array();
-	}
-
 	/**
 	 * Enables/disables TOC, doesn't override __NOTOC__
 	 * @param bool $flag