OutputPage: Hard-deprecate setSquidMaxage, renamed since 1.27

[lhc/web/wiklou.git] / includes / MediaWiki.php

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 0f40c19..9e3bc10 100644 (file)
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -367,7 +367,7 @@ class MediaWiki {
                        }
                        throw new HttpError( 500, $message );
                }
-               $output->setSquidMaxage( 1200 );
+               $output->setCdnMaxage( 1200 );
                $output->redirect( $targetUrl, '301' );
                return true;
        }
@@ -884,7 +884,9 @@ class MediaWiki {
                $trxProfiler = Profiler::instance()->getTransactionProfiler();
                $trxProfiler->resetExpectations();
                $trxProfiler->setExpectations(
-                       $this->config->get( 'TrxProfilerLimits' )['PostSend'],
+                       $this->context->getRequest()->hasSafeMethod()
+                               ? $this->config->get( 'TrxProfilerLimits' )['PostSend-GET']
+                               : $this->config->get( 'TrxProfilerLimits' )['PostSend-POST'],
                        __METHOD__
                );