From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sat, 10 Oct 2015 03:55:47 +0000 (-0700)
Subject: Fix broken min() call in OutputPage
X-Git-Tag: 1.31.0-rc.0~9453^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22lang_raccourcis%22%2C%22module=%24nom_module%22%29%20.%20%22?a=commitdiff_plain;h=25c23331e35ab3de507ecfc8834aa649c5bb2618;p=lhc%2Fweb%2Fwiklou.git

Fix broken min() call in OutputPage

Change-Id: Ia2d895371f6f114c1cb821dd1d2aaaef7935033f
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index d85c60c3f6..62e9192427 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1957,7 +1957,7 @@ class OutputPage extends ContextSource {
 	 * @since 1.27
 	 */
 	public function lowerCdnMaxage( $maxage ) {
-		$this->mCdnMaxageLimit = $this->min( $maxage, $this->mCdnMaxageLimit );
+		$this->mCdnMaxageLimit = min( $maxage, $this->mCdnMaxageLimit );
 		$this->setSquidMaxage( $this->mSquidMaxage );
 	}