diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2020-05-25 11:07:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2020-05-25 11:07:56 +0000 |
| commit | 219469d873b7c2ba9376309e2e102daf3a0ca18c (patch) | |
| tree | ed358b94961e51f6005b2d223f19aad94a905154 /includes/editpage/TextConflictHelper.php | |
| parent | 02c1ce97cc669f0efe51855ecaf20617c6a31753 (diff) | |
| parent | 8a40367a40342ae3fd31bbedd8a492d728f04353 (diff) | |
| download | mediawikicore-219469d873b7c2ba9376309e2e102daf3a0ca18c.tar.gz mediawikicore-219469d873b7c2ba9376309e2e102daf3a0ca18c.zip | |
Merge "editpage: Fix misplaced return value in TextConflictHelper"
Diffstat (limited to 'includes/editpage/TextConflictHelper.php')
| -rw-r--r-- | includes/editpage/TextConflictHelper.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/includes/editpage/TextConflictHelper.php b/includes/editpage/TextConflictHelper.php index 81c117ce6482..084a3c4bec82 100644 --- a/includes/editpage/TextConflictHelper.php +++ b/includes/editpage/TextConflictHelper.php @@ -217,6 +217,7 @@ class TextConflictHelper { * HTML to build the textbox1 on edit conflicts * * @param array $customAttribs + * @return string HTML */ public function getEditConflictMainTextBox( array $customAttribs = [] ) { $builder = new TextboxBuilder(); @@ -237,8 +238,10 @@ class TextConflictHelper { $this->title ); - $this->out->addHTML( - Html::textarea( 'wpTextbox1', $builder->addNewLineAtEnd( $this->storedversion ), $attribs ) + return Html::textarea( + 'wpTextbox1', + $builder->addNewLineAtEnd( $this->storedversion ), + $attribs ); } |