Merge "Fix broken min() call in OutputPage"

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index d85c60c..62e9192 100644 (file)
--- 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 );
        }