Chad has submitted this change and it was merged.
Change subject: Fix Fatal on various special pages introduced in 1.25.4
......................................................................
Fix Fatal on various special pages introduced in 1.25.4
Bug: T121892
Change-Id: Ie3d23af7a372fa6a5a23cd861a4d34e42fb08195
---
M RELEASE-NOTES-1.25
M includes/MediaWiki.php
M includes/OutputPage.php
3 files changed, 22 insertions(+), 3 deletions(-)
Approvals:
Chad: Verified; Looks good to me, approved
diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index 284c38c..bf3c5e8 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -1,6 +1,13 @@
Security reminder: If you have PHP's register_globals option set, you must
turn it off. MediaWiki will not work with it enabled.
+== MediaWiki 1.25.5 ==
+
+THIS IS NOT A RELEASE YET!
+
+== Changes since 1.25.4 ==
+* (T121892) Fix fatal error on some Special pages, introduced in 1.25.4.
+
== MediaWiki 1.25.4 ==
This is a security and maintenance release of the MediaWiki 1.25 branch.
diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 3955144..08ec953 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -158,7 +158,7 @@
* @return void
*/
private function performRequest() {
- global $wgTitle;
+ global $wgTitle, $wgHideIdentifiableRedirects;
$request = $this->context->getRequest();
$requestTitle = $title = $this->context->getTitle();
@@ -231,7 +231,7 @@
if ( $title->isSpecialPage() ) {
$specialPage = SpecialPageFactory::getPage(
$title->getDBKey() );
if ( $specialPage instanceof RedirectSpecialPage
- && $this->config->get(
'HideIdentifiableRedirects' )
+ && $wgHideIdentifiableRedirects
&&
$specialPage->personallyIdentifiableTarget()
) {
list( , $subpage ) =
SpecialPageFactory::resolveAlias( $title->getDBKey() );
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 7e67187..50c16a2 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -239,6 +239,8 @@
/** @var int Cache stuff. Looks like mEnableClientCache */
protected $mSquidMaxage = 0;
+ /** @var int Upper limit on mCdnMaxage */
+ protected $mCdnMaxageLimit = INF;
/**
* @var bool Controls if anti-clickjacking / frame-breaking headers will
@@ -1914,7 +1916,17 @@
* @param int $maxage Maximum cache time on the Squid, in seconds.
*/
public function setSquidMaxage( $maxage ) {
- $this->mSquidMaxage = $maxage;
+ $this->mSquidMaxage = min( $maxage, $this->mCdnMaxageLimit );
+ }
+
+ /**
+ * Lower the value of the "s-maxage" part of the "Cache-control" HTTP
header
+ *
+ * @param int $maxage Maximum cache time on the CDN, in seconds
+ */
+ public function lowerCdnMaxage( $maxage ) {
+ $this->mCdnMaxageLimit = min( $maxage, $this->mCdnMaxageLimit );
+ $this->setSquidMaxage( $this->mSquidMaxage );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/260308
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3d23af7a372fa6a5a23cd861a4d34e42fb08195
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_25
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
