Merge "Soft deprecated EditPage::submit to avoid new use"

diff --combined includes/EditPage.php
index 238c25e,0a8a409..e070ca3
--- 1/includes/EditPage.php
--- 2/includes/EditPage.php
+++ b/includes/EditPage.php
@@@ -498,6 -498,9 +498,9 @@@ class EditPage 
                $this->enableApiEditOverride = $enableOverride;
        }
  
+       /**
+        * @deprecated since 1.29, call edit directly
+        */
        function submit() {
                $this->edit();
        }
@@@ -1621,7 -1624,15 +1624,7 @@@
         */
        protected function runPostMergeFilters( Content $content, Status $status, User $user ) {
                // Run old style post-section-merge edit filter
 -              if ( !ContentHandler::runLegacyHooks( 'EditFilterMerged',
 -                      [ $this, $content, &$this->hookError, $this->summary ],
 -                      '1.21'
 -              ) ) {
 -                      # Error messages etc. could be handled within the hook...
 -                      $status->fatal( 'hookaborted' );
 -                      $status->value = self::AS_HOOK_ERROR;
 -                      return false;
 -              } elseif ( $this->hookError != '' ) {
 +              if ( $this->hookError != '' ) {
                        # ...or the hook could be expecting us to produce an error
                        $status->fatal( 'hookaborted' );
                        $status->value = self::AS_HOOK_ERROR_EXPECTED;
@@@ -3573,7 -3584,6 +3576,7 @@@ HTM
         */
        public function getCancelLink() {
                $cancelParams = [];
 +              $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
                if ( !$this->isConflict && $this->oldid > 0 ) {
                        $cancelParams['oldid'] = $this->oldid;
                } elseif ( $this->getContextTitle()->isRedirect() ) {
@@@ -3581,9 -3591,9 +3584,9 @@@
                }
                $attrs = [ 'id' => 'mw-editform-cancel' ];
  
 -              return Linker::linkKnown(
 +              return $linkRenderer->makeKnownLink(
                        $this->getContextTitle(),
 -                      $this->context->msg( 'cancel' )->parse(),
 +                      new HtmlArmor( $this->context->msg( 'cancel' )->parse() ),
                        Html::buttonAttributes( $attrs, [ 'mw-ui-quiet' ] ),
                        $cancelParams
                );
@@@ -3772,6 -3782,7 +3775,6 @@@
                        }
  
                        $hook_args = [ $this, &$content ];
 -                      ContentHandler::runLegacyHooks( 'EditPageGetPreviewText', $hook_args, '1.25' );
                        Hooks::run( 'EditPageGetPreviewContent', $hook_args );
  
                        $parserResult = $this->doPreviewParse( $content );