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

Change subject: Update convertToText.php script
......................................................................


Update convertToText.php script

Change-Id: I9758d545229a38f195766a6ce83e2b2a5784c1e1
---
M maintenance/convertToText.php
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/maintenance/convertToText.php b/maintenance/convertToText.php
index cd15897..0856011 100644
--- a/maintenance/convertToText.php
+++ b/maintenance/convertToText.php
@@ -32,7 +32,7 @@
                $topics = array();
                $headerContent = '';
 
-               $headerData = $this->flowApi( $this->pageTitle, 'header-view', 
array( 'vhcontentFormat' => 'wikitext' ), 'header' );
+               $headerData = $this->flowApi( $this->pageTitle, 'view-header', 
array( 'vhcontentFormat' => 'wikitext' ), 'header' );
 
                $headerRevision = $headerData['header']['revision'];
                if ( isset( $headerRevision['content'] ) ) {
@@ -41,7 +41,7 @@
 
                while( $continue ) {
                        $continue = false;
-                       $flowData = $this->flowApi( $this->pageTitle, 
'topiclist-view', $pagerParams, 'topiclist' );
+                       $flowData = $this->flowApi( $this->pageTitle, 
'view-topiclist', $pagerParams, 'topiclist' );
 
                        $topicListBlock = $flowData['topiclist'];
 
@@ -49,7 +49,7 @@
                                $revisionId = reset( 
$topicListBlock['posts'][$rootPostId] );
                                $revision = 
$topicListBlock['revisions'][$revisionId];
 
-                               $topicOutput = '==' . $revision['content'] . 
'==' . "\n";
+                               $topicOutput = '==' . 
$revision['content']['content'] . '==' . "\n";
                                $topicOutput .= $this->processPostCollection( 
$topicListBlock, $revision['replies'] );
 
                                $topics[] = $topicOutput;
@@ -113,8 +113,8 @@
                        $user = User::newFromName( $revision['author']['name'], 
false );
                        $postId = Flow\Model\UUID::create( $postId );
 
-                       $content = $revision['content'];
-                       $contentFormat = $revision['contentFormat'];
+                       $content = $revision['content']['content'];
+                       $contentFormat = $revision['content']['format'];
 
                        if ( $contentFormat !== 'wikitext' ) {
                                $content = Utils::convert( $contentFormat, 
'wikitext', $content, $this->pageTitle );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9758d545229a38f195766a6ce83e2b2a5784c1e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: SG <[email protected]>
Gerrit-Reviewer: Spage <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to