[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Avoid DB master use on GET in SpecialExportTranslations

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352744 )

Change subject: Avoid DB master use on GET in SpecialExportTranslations
......................................................................


Avoid DB master use on GET in SpecialExportTranslations

Change-Id: I50fd9f8cfd2313d076e66e5ec51073aa0c8e2030
---
M messagegroups/WikiPageMessageGroup.php
M tag/TranslatablePage.php
2 files changed, 12 insertions(+), 7 deletions(-)

Approvals:
  jenkins-bot: Verified
  Nikerabbit: Looks good to me, approved



diff --git a/messagegroups/WikiPageMessageGroup.php 
b/messagegroups/WikiPageMessageGroup.php
index d36d80f..a991989 100644
--- a/messagegroups/WikiPageMessageGroup.php
+++ b/messagegroups/WikiPageMessageGroup.php
@@ -12,7 +12,7 @@
  * Wraps the translatable page sections into a message group.
  * @ingroup PageTranslation MessageGroup
  */
-class WikiPageMessageGroup extends WikiMessageGroup {
+class WikiPageMessageGroup extends WikiMessageGroup implements IDBAccessObject 
{
        /**
         * @var Title|string
         */
@@ -108,9 +108,10 @@
         *
         * @param string $key Message key
         * @param string $code Language code
+        * @param integer $flags READ_* class constant bitfield
         * @return string|null Stored translation or null.
         */
-       public function getMessage( $key, $code ) {
+       public function getMessage( $key, $code, $flags = self::READ_LATEST ) {
                if ( $this->isSourceLanguage( $code ) ) {
                        $stuff = $this->load( $code );
 
@@ -123,10 +124,14 @@
                }
 
                $title = Title::makeTitleSafe( $this->getNamespace(), 
"$key/$code" );
-               $flags = PageTranslationHooks::$renderingContext
-                       ? Revision::READ_NORMAL // bug T95753
-                       : Revision::READ_LATEST;
-               $rev = Revision::newFromTitle( $title, false, $flags );
+               if ( PageTranslationHooks::$renderingContext ) {
+                       $revFlags = Revision::READ_NORMAL; // bug T95753
+               } else {
+                       $revFlags = ( $flags & self::READ_LATEST ) == 
self::READ_LATEST
+                               ? Revision::READ_LATEST
+                               : Revision::READ_NORMAL;
+               }
+               $rev = Revision::newFromTitle( $title, false, $revFlags );
 
                if ( !$rev ) {
                        return null;
diff --git a/tag/TranslatablePage.php b/tag/TranslatablePage.php
index 86a3195..ebe4476 100644
--- a/tag/TranslatablePage.php
+++ b/tag/TranslatablePage.php
@@ -256,7 +256,7 @@
                        return null;
                }
 
-               return $group->getMessage( "$page/$section", $code );
+               return $group->getMessage( "$page/$section", $code, 
$group::READ_NORMAL );
        }
 
        /**

-- 
To view, visit https://gerrit.wikimedia.org/r/352744
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I50fd9f8cfd2313d076e66e5ec51073aa0c8e2030
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits