dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Simplify watchlist edit mode handling"
[lhc/web/wiklou.git]
/
includes
/
Wiki.php
diff --git
a/includes/Wiki.php
b/includes/Wiki.php
index
edfbba2
..
50bba7b
100644
(file)
--- a/
includes/Wiki.php
+++ b/
includes/Wiki.php
@@
-302,13
+302,6
@@
class MediaWiki {
$article = $this->initializeArticle();
if ( is_object( $article ) ) {
$pageView = true;
$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 );
$this->performAction( $article, $requestTitle );
} elseif ( is_string( $article ) ) {
$output->redirect( $article );
@@
-547,7
+540,7
@@
class MediaWiki {
&& $this->context->getUser()->requiresHTTPS()
)
) &&
&& $this->context->getUser()->requiresHTTPS()
)
) &&
- $request->
detec
tProtocol() == 'http'
+ $request->
ge
tProtocol() == 'http'
) {
$oldUrl = $request->getFullRequestURL();
$redirUrl = str_replace( 'http://', 'https://', $oldUrl );
) {
$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
$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();
$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.
// 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
);
}
}
}
}
}
}