Mattflaschen has uploaded a new change for review. https://gerrit.wikimedia.org/r/204664
Change subject: Fix namespace fatals ...................................................................... Fix namespace fatals Now that https://gerrit.wikimedia.org/r/#/c/182858/ has been merged, there are fatals due to namespace issues. Change-Id: If64ebe90c6bd17e1244ad9834bde9684fc0d455a --- M includes/Formatter/RevisionFormatter.php M includes/Import/LiquidThreadsApi/Objects.php M includes/Import/LiquidThreadsApi/Source.php 3 files changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/64/204664/1 diff --git a/includes/Formatter/RevisionFormatter.php b/includes/Formatter/RevisionFormatter.php index a4730c6..3169c92 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,8 +183,10 @@ $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. + // Change all '_BC_bools' to ApiResult::META_BC_BOOLS, and remove + // checks for ApiResult::META_CONTENT (it should always be true) + // when core change (https://gerrit.wikimedia.org/r/#/c/182858/) rolls out + // everywhere. '_BC_bools' => array( // https://gerrit.wikimedia.org/r/#/c/182858/ 'isOriginalContent', diff --git a/includes/Import/LiquidThreadsApi/Objects.php b/includes/Import/LiquidThreadsApi/Objects.php index 7bd7dc9..e74d6a7 100644 --- a/includes/Import/LiquidThreadsApi/Objects.php +++ b/includes/Import/LiquidThreadsApi/Objects.php @@ -11,6 +11,7 @@ use Flow\Import\ImportException; use Flow\Import\IObjectRevision; use Flow\Import\IRevisionableObject; +use ApiResult; use Iterator; use MWTimestamp; use Title; diff --git a/includes/Import/LiquidThreadsApi/Source.php b/includes/Import/LiquidThreadsApi/Source.php index 06a4955..080be24 100644 --- a/includes/Import/LiquidThreadsApi/Source.php +++ b/includes/Import/LiquidThreadsApi/Source.php @@ -4,6 +4,7 @@ use ApiBase; use ApiMain; +use ApiResult; use Exception; use FauxRequest; use Flow\Import\ImportException; -- To view, visit https://gerrit.wikimedia.org/r/204664 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If64ebe90c6bd17e1244ad9834bde9684fc0d455a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Mattflaschen <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
