Merge "Move ApiQueryRecentChanges::parseRCType to static method on RecentChange"

[lhc/web/wiklou.git] / includes / Skin.php

diff --git a/includes/Skin.php b/includes/Skin.php
index 9d1034b..c428079 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -830,6 +830,7 @@ abstract class Skin extends ContextSource {
                }
 
                // Allow for site and per-namespace customization of copyright notice.
+               // @todo Remove deprecated $forContent param from hook handlers and then remove here.
                $forContent = true;
 
                wfRunHooks(
@@ -837,20 +838,7 @@ abstract class Skin extends ContextSource {
                        array( $this->getTitle(), $type, &$msg, &$link, &$forContent )
                );
 
-               $msgObj = $this->msg( $msg )->rawParams( $link );
-               if ( $forContent ) {
-                       $msg = $msgObj->inContentLanguage()->text();
-                       if ( $this->getLanguage()->getCode() !== $wgContLang->getCode() ) {
-                               $msg = Html::rawElement( 'span', array(
-                                       'lang' => $wgContLang->getHtmlCode(),
-                                       'dir' => $wgContLang->getDir()
-                               ), $msg );
-                       }
-
-                       return $msg;
-               } else {
-                       return $msgObj->text();
-               }
+               return $this->msg( $msg )->rawParams( $link )->text();
        }
 
        /**