jenkins-bot has submitted this change and it was merged.

Change subject: Use ApiResult::META_BC_BOOLS
......................................................................


Use ApiResult::META_BC_BOOLS

1c57794e371d74 in core has been merged.

Change-Id: I835fae0b76513a15622e8afde47546c94615686c
---
M includes/Formatter/RevisionFormatter.php
1 file changed, 6 insertions(+), 8 deletions(-)

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



diff --git a/includes/Formatter/RevisionFormatter.php 
b/includes/Formatter/RevisionFormatter.php
index a4730c6..5897af6 100644
--- a/includes/Formatter/RevisionFormatter.php
+++ b/includes/Formatter/RevisionFormatter.php
@@ -14,6 +14,7 @@
 use Flow\RevisionActionPermissions;
 use Flow\Templating;
 use Flow\UrlGenerator;
+use ApiResult;
 use GenderCache;
 use IContextSource;
 use Message;
@@ -182,10 +183,7 @@
                $moderatedRevision = $this->templating->getModeratedRevision( 
$row->revision );
                $ts = $row->revision->getRevisionId()->getTimestampObj();
                $res = array(
-                       // Change all '_BC_bools' to ApiResult::META_BC_BOOLS 
when core
-                       // change is merged.
-                       '_BC_bools' => array(
-                               // https://gerrit.wikimedia.org/r/#/c/182858/
+                       ApiResult::META_BC_BOOLS => array(
                                'isOriginalContent',
                                'isModerated',
                        ),
@@ -249,8 +247,8 @@
                }
 
                if ( $row instanceof TopicRow ) {
-                       $res['_BC_bools'] = array_merge(
-                               $res['_BC_bools'],
+                       $res[ApiResult::META_BC_BOOLS] = array_merge(
+                               $res[ApiResult::META_BC_BOOLS],
                                array(
                                        'isWatched',
                                        'watchable',
@@ -278,8 +276,8 @@
                }
 
                if ( $row->revision instanceof PostRevision ) {
-                       $res['_BC_bools'] = array_merge(
-                               $res['_BC_bools'],
+                       $res[ApiResult::META_BC_BOOLS] = array_merge(
+                               $res[ApiResult::META_BC_BOOLS],
                                array(
                                        'isMaxThreadingDepth',
                                )

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I835fae0b76513a15622e8afde47546c94615686c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to