X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=includes%2FWiki.php;h=50bba7b9fc02d2d6cb484d021f064c4fcce0bec2;hb=6d4f5d142f28ade566dd6cd97af129c582e6f27b;hp=edfbba2d28e5802dac45f0b138d174765491b4d8;hpb=5c3fecdb372bbd96301a1c21d8fae3219c55a356;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Wiki.php b/includes/Wiki.php
index edfbba2d28..50bba7b9fc 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -302,13 +302,6 @@ class MediaWiki {
 			$article = $this->initializeArticle();
 			if ( is_object( $article ) ) {
 				$pageView = true;
-				/**
-				 * $wgArticle is deprecated, do not use it.
-				 * @deprecated since 1.18
-				 */
-				global $wgArticle;
-				$wgArticle = new DeprecatedGlobal( 'wgArticle', $article, '1.18' );
-
 				$this->performAction( $article, $requestTitle );
 			} elseif ( is_string( $article ) ) {
 				$output->redirect( $article );
@@ -547,7 +540,7 @@ class MediaWiki {
 					&& $this->context->getUser()->requiresHTTPS()
 				)
 			) &&
-			$request->detectProtocol() == 'http'
+			$request->getProtocol() == 'http'
 		) {
 			$oldUrl = $request->getFullRequestURL();
 			$redirUrl = str_replace( 'http://', 'https://', $oldUrl );
@@ -588,6 +581,7 @@ class MediaWiki {
 						$cache->loadFromFileCache( $this->context );
 					}
 					// Do any stats increment/watchlist stuff
+					// Assume we're viewing the latest revision (this should always be the case with file cache)
 					$this->context->getWikiPage()->doViewUpdates( $this->context->getUser() );
 					// Tell OutputPage that output is taken care of
 					$this->context->getOutput()->disable();
@@ -687,7 +681,7 @@ class MediaWiki {
 				// We don't want exceptions thrown during job execution to
 				// be reported to the user since the output is already sent.
 				// Instead we just log them.
-				wfDebugLog( 'exception', $e->getLogMessage() );
+				MWExceptionHandler::logException( $e );
 			}
 		}
 	}