Merge "Parse "retrievedfrom" and "lastmodifiedat""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 18 Feb 2015 17:16:18 +0000 (17:16 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 18 Feb 2015 17:16:18 +0000 (17:16 +0000)
1  2 
includes/skins/Skin.php

diff --combined includes/skins/Skin.php
@@@ -646,7 -646,7 +646,7 @@@ abstract class Skin extends ContextSour
  
                return $this->msg( 'retrievedfrom' )
                        ->rawParams( '<a dir="ltr" href="' . $url. '">' . $url . '</a>' )
-                       ->escaped();
+                       ->parse();
        }
  
        /**
                $action = $this->getRequest()->getVal( 'action', 'view' );
  
                if ( $this->getTitle()->userCan( 'deletedhistory', $this->getUser() ) &&
 -                      ( $this->getTitle()->getArticleID() == 0 || $action == 'history' ) ) {
 +                      ( !$this->getTitle()->exists() || $action == 'history' ) ) {
                        $n = $this->getTitle()->isDeleted();
  
                        if ( $n ) {
                if ( $timestamp ) {
                        $d = $this->getLanguage()->userDate( $timestamp, $this->getUser() );
                        $t = $this->getLanguage()->userTime( $timestamp, $this->getUser() );
-                       $s = ' ' . $this->msg( 'lastmodifiedat', $d, $t )->escaped();
+                       $s = ' ' . $this->msg( 'lastmodifiedat', $d, $t )->parse();
                } else {
                        $s = '';
                }
  
                return array(
                        'href' => $title->getLocalURL( $urlaction ),
 -                      'exists' => $title->getArticleID() != 0,
 +                      'exists' => $title->isKnown(),
                );
        }