EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/130532
Change subject: Merge remote-tracking branch 'gerrit/master' into frontend-rewrite ...................................................................... Merge remote-tracking branch 'gerrit/master' into frontend-rewrite Change-Id: I8dfea2037a2d6563d3f99a45ea63264a85760890 --- M Flow.php M includes/Formatter/RevisionFormatter.php M includes/api/ApiQueryFlow.php 3 files changed, 0 insertions(+), 30 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/32/130532/1 diff --git a/Flow.php b/Flow.php index d536481..00ac9b1 100755 --- a/Flow.php +++ b/Flow.php @@ -176,15 +176,11 @@ $wgAutoloadClasses['Flow\Formatter\RecentChanges'] = $dir . 'includes/Formatter/RecentChanges.php'; $wgAutoloadClasses['Flow\Formatter\RecentChangesQuery'] = $dir . 'includes/Formatter/RecentChangesQuery.php'; $wgAutoloadClasses['Flow\Formatter\RecentChangesRow'] = $dir . 'includes/Formatter/RecentChangesQuery.php'; -<<<<<<< HEAD (49e2e0 Fix missing edit token) $wgAutoloadClasses['Flow\Formatter\SinglePostQuery'] = $dir . 'includes/Formatter/SinglePostQuery.php'; $wgAutoloadClasses['Flow\Formatter\TopicListQuery'] = $dir . 'includes/Formatter/TopicListQuery.php'; $wgAutoloadClasses['Flow\Formatter\TopicHistoryQuery'] = $dir . 'includes/Formatter/TopicHistoryQuery.php'; $wgAutoloadClasses['Flow\Formatter\TopicRow'] = $dir . 'includes/Formatter/TopicRow.php'; - -======= $wgAutoloadClasses['Flow\Formatter\IRCLineUrlFormatter'] = $dir . 'includes/Formatter/IRCLineUrlFormatter.php'; ->>>>>>> BRANCH (9e19ba Localisation updates from https://translatewiki.net.) // Convert model instances into array of user-visible data $wgAutoloadClasses['Flow\Formatter\RevisionFormatter'] = $dir . 'includes/Formatter/RevisionFormatter.php'; diff --git a/includes/Formatter/RevisionFormatter.php b/includes/Formatter/RevisionFormatter.php index 2d970fe..36bdd06 100644 --- a/includes/Formatter/RevisionFormatter.php +++ b/includes/Formatter/RevisionFormatter.php @@ -566,14 +566,8 @@ $title, 'compare-header-revisions', array( -<<<<<<< HEAD (49e2e0 Fix missing edit token) - 'workflow' => $workflowId, - 'header_newRevision' => $revId, - 'header_oldRevision' => $row->revision->getPrevRevisionId()->getAlphadecimal(), -======= 'workflow' => $workflowId->getAlphadecimal(), 'header_newRevision' => $revId->getAlphadecimal(), ->>>>>>> BRANCH (9e19ba Localisation updates from https://translatewiki.net.) ) ), 'title' => $this->msg( 'diff' ) @@ -606,15 +600,9 @@ $title, 'compare-header-revisions', array( -<<<<<<< HEAD (49e2e0 Fix missing edit token) - 'workflow' => $workflowId, - 'topic_newRevision' => $cur->getRevisionId()->getAlphadecimal(), - 'topic_oldRevision' => $revId, -======= 'workflow' => $workflowId->getAlphadecimal(), 'header_newRevision' => $cur->getRevisionId()->getAlphadecimal(), 'header_oldRevision' => $revId->getAlphadecimal(), ->>>>>>> BRANCH (9e19ba Localisation updates from https://translatewiki.net.) ) ), 'title' => $this->msg( 'cur' ) @@ -637,14 +625,8 @@ $title, 'compare-post-revisions', array( -<<<<<<< HEAD (49e2e0 Fix missing edit token) - 'workflow' => $workflowId, - 'topic_newRevision' => $revId, - 'topic_oldRevision' => $row->revision->getPrevRevisionId()->getAlphadecimal(), -======= 'workflow' => $workflowId->getAlphadecimal(), 'topic_newRevision' => $revId->getAlphadecimal(), ->>>>>>> BRANCH (9e19ba Localisation updates from https://translatewiki.net.) ) ), 'title' => $this->msg( 'diff' ) diff --git a/includes/api/ApiQueryFlow.php b/includes/api/ApiQueryFlow.php index 76cb161..44519de 100644 --- a/includes/api/ApiQueryFlow.php +++ b/includes/api/ApiQueryFlow.php @@ -48,7 +48,6 @@ } } -<<<<<<< HEAD (49e2e0 Fix missing edit token) array_walk_recursive( $result, function( &$value ) { // This is required untill php 5.4.0 after which we can // implement the JsonSerializable interface for Message @@ -56,14 +55,7 @@ $value = $value->text(); } } ); -======= - $result = array( - 'element' => 'block', - 'workflow-id' => $this->loader->getWorkflow()->getId()->getAlphadecimal(), - ) + $blockOutput; - $this->getResult()->setIndexedTagName( $result, 'block' ); ->>>>>>> BRANCH (9e19ba Localisation updates from https://translatewiki.net.) $this->getResult()->addValue( 'query', $this->getModuleName(), $result ); } -- To view, visit https://gerrit.wikimedia.org/r/130532 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8dfea2037a2d6563d3f99a45ea63264a85760890 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: frontend-rewrite Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
