From: jenkins-bot Date: Wed, 18 Feb 2015 17:16:18 +0000 (+0000) Subject: Merge "Parse "retrievedfrom" and "lastmodifiedat"" X-Git-Tag: 1.31.0-rc.0~12377 X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=325a40dd0654c5d7d4e9845bf0b05edea90281df;hp=-c;p=lhc%2Fweb%2Fwiklou.git Merge "Parse "retrievedfrom" and "lastmodifiedat"" --- 325a40dd0654c5d7d4e9845bf0b05edea90281df diff --combined includes/skins/Skin.php index c858cfa696,3d45d7d445..244a278378 --- a/includes/skins/Skin.php +++ b/includes/skins/Skin.php @@@ -646,7 -646,7 +646,7 @@@ abstract class Skin extends ContextSour return $this->msg( 'retrievedfrom' ) ->rawParams( '' . $url . '' ) - ->escaped(); + ->parse(); } /** @@@ -656,7 -656,7 +656,7 @@@ $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 ) { @@@ -863,7 -863,7 +863,7 @@@ 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 = ''; } @@@ -1166,7 -1166,7 +1166,7 @@@ return array( 'href' => $title->getLocalURL( $urlaction ), - 'exists' => $title->getArticleID() != 0, + 'exists' => $title->isKnown(), ); }