Werdna has submitted this change and it was merged.
Change subject: Repair edit-post API functionality
......................................................................
Repair edit-post API functionality
Change-Id: I6be168fa7e9f27c27d305a0c345c05b0dce21113
---
M includes/Block/Topic.php
M includes/api/ApiFlow.php
M includes/api/ApiQueryFlow.php
M modules/discussion/discussion.js
4 files changed, 9 insertions(+), 7 deletions(-)
Approvals:
Werdna: Verified; Looks good to me, approved
diff --git a/includes/Block/Topic.php b/includes/Block/Topic.php
index 8987b45..e5c9d1b 100644
--- a/includes/Block/Topic.php
+++ b/includes/Block/Topic.php
@@ -307,7 +307,7 @@
throw new MWException( "Requested post could
not be found" );
}
- return $this->renderPostAPI( $post, $options );
+ return array( $this->renderPostAPI( $post, $options ) );
} else {
return $this->renderTopicAPI( $options );
}
diff --git a/includes/api/ApiFlow.php b/includes/api/ApiFlow.php
index 9cf7772..0cf4418 100644
--- a/includes/api/ApiFlow.php
+++ b/includes/api/ApiFlow.php
@@ -172,4 +172,4 @@
public function getTokenSalt() {
return 'flow';
}
-}
\ No newline at end of file
+}
diff --git a/includes/api/ApiQueryFlow.php b/includes/api/ApiQueryFlow.php
index e8deac3..faef3e3 100644
--- a/includes/api/ApiQueryFlow.php
+++ b/includes/api/ApiQueryFlow.php
@@ -84,4 +84,4 @@
public function getVersion() {
return __CLASS__ . '-0.1';
}
-}
\ No newline at end of file
+}
diff --git a/modules/discussion/discussion.js b/modules/discussion/discussion.js
index 42403eb..451f35a 100644
--- a/modules/discussion/discussion.js
+++ b/modules/discussion/discussion.js
@@ -105,7 +105,7 @@
$button.show();
$form.find( '.flow-cancel-link'
)
.click();
-
+
deferredObject.resolve.apply(
$button, arguments );
} )
.fail( function( ) {
@@ -322,8 +322,10 @@
pageName,
workflowId,
{
- 'no-children' : true,
- 'postId' : postId
+ 'topic' : {
+ 'no-children' : true,
+ 'postId' : postId
+ }
}
)
.done( function( data ) {
@@ -552,4 +554,4 @@
}
} );
});
-} )( jQuery, mediaWiki );
\ No newline at end of file
+} )( jQuery, mediaWiki );
--
To view, visit https://gerrit.wikimedia.org/r/79923
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6be168fa7e9f27c27d305a0c345c05b0dce21113
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson (WMF) <[email protected]>
Gerrit-Reviewer: Werdna <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
