Include bot password app ID in audit data

[lhc/web/wiklou.git] / includes / cache / MessageCache.php

diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 5dee0f6..b669fcd 100644 (file)
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -270,6 +270,17 @@ class MessageCache {
 
                $this->overridable = array_flip( Language::getMessageKeysFor( $code ) );
 
+               // T208897 array_flip can fail and return null
+               if ( is_null( $this->overridable ) ) {
+                       LoggerFactory::getInstance( 'MessageCache' )->error(
+                               __METHOD__ . ': $this->overridable is null',
+                               [
+                                       'message_keys' => Language::getMessageKeysFor( $code ),
+                                       'code' => $code
+                               ]
+                       );
+               }
+
                # 8 lines of code just to say (once) that message cache is disabled
                if ( $this->mDisable ) {
                        static $shownDisabled = false;
@@ -516,7 +527,7 @@ class MessageCache {
                foreach ( $res as $row ) {
                        $name = $this->contLang->lcfirst( $row->page_title );
                        // Include entries/stubs for all keys in $mostused in adaptive mode
-                       if ( $wgAdaptiveMessageCache || isset( $overridable[$name] ) ) {
+                       if ( $wgAdaptiveMessageCache || $this->isMainCacheable( $name, $overridable ) ) {
                                $cache[$row->page_title] = '!TOO BIG';
                        }
                        // At least include revision ID so page changes are reflected in the hash
@@ -538,7 +549,7 @@ class MessageCache {
                foreach ( $res as $row ) {
                        $name = $this->contLang->lcfirst( $row->page_title );
                        // Include entries/stubs for all keys in $mostused in adaptive mode
-                       if ( $wgAdaptiveMessageCache || isset( $overridable[$name] ) ) {
+                       if ( $wgAdaptiveMessageCache || $this->isMainCacheable( $name, $overridable ) ) {
                                $text = Revision::getRevisionText( $row );
                                if ( $text === false ) {
                                        // Failed to fetch data; possible ES errors?
@@ -574,6 +585,17 @@ class MessageCache {
                return $cache;
        }
 
+       /**
+        * @param string $name Message name with lowercase first letter
+        * @param array $overridable Map of (key => unused) for software-defined messages
+        * @return bool
+        */
+       private function isMainCacheable( $name, array $overridable ) {
+               // Include common conversion table pages. This also avoids problems with
+               // Installer::parse() bailing out due to disallowed DB queries (T207979).
+               return ( isset( $overridable[$name] ) || strpos( $name, 'conversiontable/' ) === 0 );
+       }
+
        /**
         * Updates cache as necessary when message page is changed
         *
@@ -1042,7 +1064,8 @@ class MessageCache {
                        );
                } else {
                        // Message page either does not exist or does not override a software message
-                       if ( !isset( $this->overridable[$this->contLang->lcfirst( $title )] ) ) {
+                       $name = $this->contLang->lcfirst( $title );
+                       if ( !$this->isMainCacheable( $name, $this->overridable ) ) {
                                // Message page does not override any software-defined message. A custom
                                // message might be defined to have content or settings specific to the wiki.
                                // Load the message page, utilizing the individual message cache as needed.