Merge "Replace deprecated calls to OutputPage::parse()"

diff --combined includes/skins/Skin.php
index 91d2a7e,fa09347..1b91c89
--- 1/includes/skins/Skin.php
--- 2/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@@ -1444,7 -1444,7 +1444,7 @@@ abstract class Skin extends ContextSour
                        return $newMessagesAlert;
                }
  
 -              if ( count( $newtalks ) == 1 && $newtalks[0]['wiki'] === wfWikiID() ) {
 +              if ( count( $newtalks ) == 1 && WikiMap::isCurrentWikiId( $newtalks[0]['wiki'] ) ) {
                        $uTalkTitle = $user->getTalkPage();
                        $lastSeenRev = $newtalks[0]['rev'] ?? null;
                        $nofAuthors = 0;
@@@ -1554,7 -1554,7 +1554,7 @@@
                        // TTL in seconds
                        600,
                        function () use ( $notice ) {
-                               return $this->getOutput()->parse( $notice );
+                               return $this->getOutput()->parseAsInterface( $notice );
                        }
                );
  

diff --combined includes/specials/SpecialUpload.php
index 4dbfc54,d3abbc5..dbb1481
--- 1/includes/specials/SpecialUpload.php
--- 2/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@@ -324,13 -324,7 +324,13 @@@ class SpecialUpload extends SpecialPag
                                );
                                $link = $this->msg( $user->isAllowed( 'delete' ) ? 'thisisdeleted' : 'viewdeleted' )
                                        ->rawParams( $restorelink )->parseAsBlock();
 -                              $this->getOutput()->addHTML( "<div id=\"contentSub2\">{$link}</div>" );
 +                              $this->getOutput()->addHTML(
 +                                      Html::rawElement(
 +                                              'div',
 +                                              [ 'id' => 'contentSub2' ],
 +                                              $link
 +                                      )
 +                              );
                        }
                }
        }
@@@ -489,7 -483,7 +489,7 @@@
                // Fetch the file if required
                $status = $this->mUpload->fetchFile();
                if ( !$status->isOK() ) {
-                       $this->showUploadError( $this->getOutput()->parse( $status->getWikiText() ) );
+                       $this->showUploadError( $this->getOutput()->parseAsInterface( $status->getWikiText() ) );
  
                        return;
                }
@@@ -559,7 -553,9 +559,9 @@@
                        $changeTagsStatus = ChangeTags::canAddTagsAccompanyingChange(
                                $changeTags, $this->getUser() );
                        if ( !$changeTagsStatus->isOK() ) {
-                               $this->showUploadError( $this->getOutput()->parse( $changeTagsStatus->getWikiText() ) );
+                               $this->showUploadError( $this->getOutput()->parseAsInterface(
+                                       $changeTagsStatus->getWikiText()
+                               ) );
  
                                return;
                        }
@@@ -574,7 -570,9 +576,9 @@@
                );
  
                if ( !$status->isGood() ) {
-                       $this->showRecoverableUploadError( $this->getOutput()->parse( $status->getWikiText() ) );
+                       $this->showRecoverableUploadError(
+                               $this->getOutput()->parseAsInterface( $status->getWikiText() )
+                       );
  
                        return;
                }