jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/393181 )
Change subject: Removes usages of deprecated methods in EditIndexPage ...................................................................... Removes usages of deprecated methods in EditIndexPage Change-Id: I94623cca2007c971748cf934c84aada2035ba584 --- M includes/index/EditIndexPage.php 1 file changed, 5 insertions(+), 6 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/index/EditIndexPage.php b/includes/index/EditIndexPage.php index 0dd7ad4..f1e0008 100644 --- a/includes/index/EditIndexPage.php +++ b/includes/index/EditIndexPage.php @@ -47,7 +47,7 @@ * @see EditPage::showContentForm */ protected function showContentForm() { - $pageLang = $this->mTitle->getPageLanguage(); + $pageLang = $this->getTitle()->getPageLanguage(); $out = $this->context->getOutput(); $out->enableOOUI(); $inputOptions = [ 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir() ]; @@ -81,7 +81,7 @@ private function buildField( CustomIndexField $field, $inputOptions ) { $key = $this->getFieldNameForEntry( $field->getKey() ); - $val = $this->safeUnicodeOutput( $field->getStringValue() ); + $val = $field->getStringValue(); $inputOptions['name'] = $key; $inputOptions['value'] = $val; @@ -149,7 +149,7 @@ $fields = []; foreach ( $config as $key => $params ) { $field = $this->getFieldNameForEntry( $key ); - $value = $this->cleanInputtedContent( $this->safeUnicodeInput( $request, $field ) ); + $value = $this->cleanInputtedContent( $request->getText( $field ) ); $entry = new CustomIndexField( $key, $value, $params ); if ( !$entry->isHidden() ) { $fields[$entry->getKey()] = new WikitextContent( $entry->getStringValue() ); @@ -172,17 +172,16 @@ $value = preg_replace( '/\|/', '&!&', $value ); // ...except in links... - $prev = ''; do { $prev = $value; $value = preg_replace( '/\[\[(.*?)&!&(.*?)\]\]/', '[[$1|$2]]', $value ); - } while ( $value != $prev ); + } while ( $value !== $prev ); // ..and in templates do { $prev = $value; $value = preg_replace( '/\{\{(.*?)&!&(.*?)\}\}/s', '{{$1|$2}}', $value ); - } while ( $value != $prev ); + } while ( $value !== $prev ); $value = preg_replace( '/&!&/', '{{!}}', $value ); -- To view, visit https://gerrit.wikimedia.org/r/393181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I94623cca2007c971748cf934c84aada2035ba584 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ProofreadPage Gerrit-Branch: master Gerrit-Owner: Tpt <thoma...@hotmail.fr> Gerrit-Reviewer: Legoktm <lego...@member.fsf.org> Gerrit-Reviewer: Tpt <thoma...@hotmail.fr> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits