jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/388147 )
Change subject: OutputPage: Hard-deprecate setSquidMaxage, renamed since 1.27
......................................................................
OutputPage: Hard-deprecate setSquidMaxage, renamed since 1.27
Renamed and deprecated in MediaWiki in f606fd8d since 1.27.
Only six uses in Wikimedia-hosted git repositories, marked as
dependencies. Also one use snuck back into MediaWiki itself,
fixed in this patch.
Depends-On: Ie8c13a6b1dc1b7861f6c27bbba996099375f066b
Depends-On: Ic2ea90343efda6533c06ca1325bc85d9aa776078
Depends-On: Ibba2f486f0ecb684ded7efb09f9942f5e0f5fd7a
Depends-On: Id27a48e10fd127e00f68e1020e8f40e30ba9a251
Depends-On: Ifd6db7910a71bb700484d6b588327424f11c00e0
Depends-On: I6523059941eb5f86274e364a8d5cc74b849655a4
Change-Id: I2cdfcd60fc7934830e3e6ec132958aa2aa1fe486
---
M includes/MediaWiki.php
M includes/OutputPage.php
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 43de4ba..9e3bc10 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -367,7 +367,7 @@
}
throw new HttpError( 500, $message );
}
- $output->setSquidMaxage( 1200 );
+ $output->setCdnMaxage( 1200 );
$output->redirect( $targetUrl, '301' );
return true;
}
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 500be8d..4635f99 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1976,6 +1976,7 @@
* @deprecated since 1.27 Use setCdnMaxage() instead
*/
public function setSquidMaxage( $maxage ) {
+ wfDeprecated( __METHOD__, '1.27' );
$this->setCdnMaxage( $maxage );
}
--
To view, visit https://gerrit.wikimedia.org/r/388147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2cdfcd60fc7934830e3e6ec132958aa2aa1fe486
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
