Merge "Don't double escape in Linker::formatLinksInComment"

diff --combined includes/Linker.php
index 3a039f6,e6b17bc..238bb53
--- 1/includes/Linker.php
--- 2/includes/Linker.php
+++ b/includes/Linker.php
@@@ -1464,9 -1464,9 +1464,9 @@@ class Linker 
  
                                                if ( $wikiId !== null ) {
                                                        $thelink = Linker::makeExternalLink(
-                                                               WikiMap::getForeignURL( $wikiId, $target->getPrefixedURL() ),
+                                                               WikiMap::getForeignURL( $wikiId, $target->getFullText() ),
                                                                $linkText . $inside,
-                                                               true
+                                                               /* escape = */ false // Already escaped
                                                        ) . $trail;
                                                } else {
                                                        $thelink = Linker::link(
@@@ -1605,7 -1605,7 +1605,7 @@@
         * @return string HTML fragment
         */
        public static function revComment( Revision $rev, $local = false, $isPublic = false ) {
 -              if ( $rev->getRawComment() == "" ) {
 +              if ( $rev->getComment( Revision::RAW ) == "" ) {
                        return "";
                }
                if ( $rev->isDeleted( Revision::DELETED_COMMENT ) && $isPublic ) {
@@@ -1870,7 -1870,7 +1870,7 @@@
                $editCount = 0;
                $moreRevs = false;
                foreach ( $res as $row ) {
 -                      if ( $rev->getRawUserText() != $row->rev_user_text ) {
 +                      if ( $rev->getUserText( Revision::RAW ) != $row->rev_user_text ) {
                                if ( $verify &&
                                        ( $row->rev_deleted & Revision::DELETED_TEXT
                                                || $row->rev_deleted & Revision::DELETED_USER
@@@ -2043,14 -2043,14 +2043,14 @@@
                                if ( $titleObj->quickUserCan( 'edit' ) ) {
                                        $editLink = self::link(
                                                $titleObj,
 -                                              wfMessage( 'editlink' )->text(),
 +                                              wfMessage( 'editlink' )->escaped(),
                                                array(),
                                                array( 'action' => 'edit' )
                                        );
                                } else {
                                        $editLink = self::link(
                                                $titleObj,
 -                                              wfMessage( 'viewsourcelink' )->text(),
 +                                              wfMessage( 'viewsourcelink' )->escaped(),
                                                array(),
                                                array( 'action' => 'edit' )
                                        );