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
(zhtable) Add zh2Hans: '这么' => '这么' for better segmentation
[lhc/web/wiklou.git]
/
includes
/
Wiki.php
diff --git
a/includes/Wiki.php
b/includes/Wiki.php
index
ed02a3d
..
d4840cc
100644
(file)
--- a/
includes/Wiki.php
+++ b/
includes/Wiki.php
@@
-178,7
+178,7
@@
class MediaWiki {
wfProfileIn( __METHOD__ );
$request = $this->context->getRequest();
wfProfileIn( __METHOD__ );
$request = $this->context->getRequest();
- $title = $this->context->getTitle();
+ $
requestTitle = $
title = $this->context->getTitle();
$output = $this->context->getOutput();
$user = $this->context->getUser();
$output = $this->context->getOutput();
$user = $this->context->getUser();
@@
-302,7
+302,7
@@
class MediaWiki {
global $wgArticle;
$wgArticle = new DeprecatedGlobal( 'wgArticle', $article, '1.18' );
global $wgArticle;
$wgArticle = new DeprecatedGlobal( 'wgArticle', $article, '1.18' );
- $this->performAction( $article );
+ $this->performAction( $article
, $requestTitle
);
} elseif ( is_string( $article ) ) {
$output->redirect( $article );
} else {
} elseif ( is_string( $article ) ) {
$output->redirect( $article );
} else {
@@
-396,8
+396,9
@@
class MediaWiki {
* Perform one of the "standard" actions
*
* @param $page Page
* Perform one of the "standard" actions
*
* @param $page Page
+ * @param $requestTitle The original title, before any redirects were applied
*/
*/
- private function performAction( Page $page ) {
+ private function performAction( Page $page
, Title $requestTitle
) {
global $wgUseSquid, $wgSquidMaxage;
wfProfileIn( __METHOD__ );
global $wgUseSquid, $wgSquidMaxage;
wfProfileIn( __METHOD__ );
@@
-420,7
+421,7
@@
class MediaWiki {
if ( $action instanceof Action ) {
# Let Squid cache things if we can purge them.
if ( $wgUseSquid &&
if ( $action instanceof Action ) {
# Let Squid cache things if we can purge them.
if ( $wgUseSquid &&
- in_array( $request->getFullRequestURL(), $
t
itle->getSquidURLs() )
+ in_array( $request->getFullRequestURL(), $
requestT
itle->getSquidURLs() )
) {
$output->setSquidMaxage( $wgSquidMaxage );
}
) {
$output->setSquidMaxage( $wgSquidMaxage );
}
@@
-573,9
+574,6
@@
class MediaWiki {
// Execute a job from the queue
$this->doJobs();
// Execute a job from the queue
$this->doJobs();
- // Log message usage, if $wgAdaptiveMessageCache is set to true
- MessageCache::logMessages();
-
// Log profiling data, e.g. in the database or UDP
wfLogProfilingData();
// Log profiling data, e.g. in the database or UDP
wfLogProfilingData();