jenkins-bot has submitted this change and it was merged.
Change subject: ApiVisualEditor: Rename editResult to result
......................................................................
ApiVisualEditor: Rename editResult to result
$editResult is confusing as it is the same as ['edit']['result']
as one would expect.
Change-Id: I8cf39359307f39450f53331ce885d2ad420168ce
---
M ApiVisualEditor.php
1 file changed, 10 insertions(+), 9 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 2160fac..dfb3f6c 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -288,24 +288,25 @@
$this->dieUsage( 'Error contacting the
Parsoid server', 'parsoidserver' );
}
- $editResult = $this->saveWikitext( $page,
$wikitext, $params );
+ $result = $this->saveWikitext( $page,
$wikitext, $params );
+ $editStatus = $result['edit']['result'];
if (
- !isset( $editResult['edit']['result'] )
||
- $editResult['edit']['result'] !==
'Success'
+ !isset( $result['edit']['result'] ) ||
+ $editStatus !== 'Success'
) {
$result = array(
'result' => 'error',
- 'edit' => $editResult['edit']
+ 'edit' => $result['edit']
);
} else {
- if ( isset(
$editResult['edit']['newrevid'] ) && $wgVisualEditorUseChangeTagging ) {
+ if ( isset( $result['edit']['newrevid']
) && $wgVisualEditorUseChangeTagging ) {
ChangeTags::addTags(
'visualeditor', null,
- intval(
$editResult['edit']['newrevid'] ),
+ intval(
$result['edit']['newrevid'] ),
null
);
if ( $params['needcheck'] ) {
ChangeTags::addTags(
'visualeditor-needcheck', null,
- intval(
$editResult['edit']['newrevid'] ),
+ intval(
$result['edit']['newrevid'] ),
null
);
}
@@ -315,8 +316,8 @@
$this->dieUsage( 'Error
contacting the Parsoid server', 'parsoidserver' );
}
$result['result'] = 'success';
- if ( isset(
$editResult['edit']['newrevid'] ) ) {
- $result['newrevid'] = intval(
$editResult['edit']['newrevid'] );
+ if ( isset( $result['edit']['newrevid']
) ) {
+ $result['newrevid'] = intval(
$result['edit']['newrevid'] );
}
}
break;
--
To view, visit https://gerrit.wikimedia.org/r/71151
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8cf39359307f39450f53331ce885d2ad420168ce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
