Merge "Http::getProxy() method to get proxy configuration"

[lhc/web/wiklou.git] / includes / parser / ParserCache.php

diff --git a/includes/parser/ParserCache.php b/includes/parser/ParserCache.php
index 0eba166..916cfc2 100644 (file)
--- a/includes/parser/ParserCache.php
+++ b/includes/parser/ParserCache.php
@@ -64,7 +64,7 @@ class ParserCache {
                global $wgRequest;
 
                // idhash seem to mean 'page id' + 'rendering hash' (r3710)
-               $pageid = $article->getID();
+               $pageid = $article->getId();
                $renderkey = (int)( $wgRequest->getVal( 'action' ) == 'render' );
 
                $key = wfMemcKey( 'pcache', 'idhash', "{$pageid}-{$renderkey}!{$hash}" );
@@ -76,7 +76,7 @@ class ParserCache {
         * @return mixed|string
         */
        protected function getOptionsKey( $article ) {
-               $pageid = $article->getID();
+               $pageid = $article->getId();
                return wfMemcKey( 'pcache', 'idoptions', "{$pageid}" );
        }
 
@@ -234,7 +234,7 @@ class ParserCache {
                        );
                        $value = false;
                } elseif (
-                       Hooks::run( 'RejectParserCacheValue', array( $value, $wikiPage, $popts ) ) === false
+                       Hooks::run( 'RejectParserCacheValue', [ $value, $wikiPage, $popts ] ) === false
                ) {
                        wfIncrStats( 'pcache.miss.rejected' );
                        wfDebug(
@@ -295,7 +295,7 @@ class ParserCache {
 
                        Hooks::run(
                                'ParserCacheSaveComplete',
-                               array( $this, $parserOutput, $page->getTitle(), $popts, $revId )
+                               [ $this, $parserOutput, $page->getTitle(), $popts, $revId ]
                        );
                } else {
                        wfDebug( "Parser output was marked as uncacheable and has not been saved.\n" );