# should be in page content language
$pageLang = $this->getTitle()->getPageLanguage();
$out->addHTML( Xml::openElement( 'div', array( 'id' => 'mw-imagepage-content',
- 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir(),
+ 'lang' => $pageLang->getHtmlCode(), 'dir' => $pageLang->getDir(),
'class' => 'mw-content-'.$pageLang->getDir() ) ) );
parent::view();
if ( $page > 1 ) {
$label = $out->parse( wfMsg( 'imgmultipageprev' ), false );
- $link = Linker::link(
+ $link = Linker::linkKnown(
$this->getTitle(),
$label,
array(),
- array( 'page' => $page - 1 ),
- array( 'known', 'noclasses' )
+ array( 'page' => $page - 1 )
);
$thumb1 = Linker::makeThumbLinkObj( $this->getTitle(), $this->displayImg, $link, $label, 'none',
array( 'page' => $page - 1 ) );
if ( $page < $count ) {
$label = wfMsg( 'imgmultipagenext' );
- $link = Linker::link(
+ $link = Linker::linkKnown(
$this->getTitle(),
$label,
array(),
- array( 'page' => $page + 1 ),
- array( 'known', 'noclasses' )
+ array( 'page' => $page + 1 )
);
$thumb2 = Linker::makeThumbLinkObj( $this->getTitle(), $this->displayImg, $link, $label, 'none',
array( 'page' => $page + 1 ) );
# External editing link
if ( $wgUseExternalEditor ) {
- $elink = Linker::link(
+ $elink = Linker::linkKnown(
$this->getTitle(),
wfMsgHtml( 'edit-externally' ),
array(),
'action' => 'edit',
'externaledit' => 'true',
'mode' => 'file'
- ),
- array( 'known', 'noclasses' )
+ )
);
$out->addHTML(
'<li id="mw-imagepage-edit-external">' . $elink . ' <small>' .
$link2 = Linker::linkKnown( Title::makeTitle( $row->page_namespace, $row->page_title ) );
$ul .= Html::rawElement(
'li',
- array( 'id' => 'mw-imagepage-linkstoimage-ns' . $element->page_namespace ),
+ array( 'class' => 'mw-imagepage-linkstoimage-ns' . $element->page_namespace ),
$link2
) . "\n";
}
}
$out->addHTML( Html::rawElement(
'li',
- array( 'id' => 'mw-imagepage-linkstoimage-ns' . $element->page_namespace ),
+ array( 'class' => 'mw-imagepage-linkstoimage-ns' . $element->page_namespace ),
$liContents
) . "\n"
);
foreach ( $dupes as $file ) {
$fromSrc = '';
if ( $file->isLocal() ) {
- $link = Linker::link(
- $file->getTitle(),
- null,
- array(),
- array(),
- array( 'known', 'noclasses' )
- );
+ $link = Linker::linkKnown( $file->getTitle() );
} else {
$link = Linker::makeExternalLink( $file->getDescriptionUrl(),
$file->getTitle()->getPrefixedText() );
* @return string
*/
public function beginImageHistoryList( $navLinks = '' ) {
- return Xml::element( 'h2', array( 'id' => 'filehistory' ), wfMsg( 'filehist' ) ) . "\n"
+ return Xml::element( 'h2', array( 'id' => 'filehistory' ), $this->msg( 'filehist' )->text() ) . "\n"
. "<div id=\"mw-imagepage-section-filehistory\">\n"
- . $this->getOutput()->parse( wfMsgNoTrans( 'filehist-help' ) )
+ . $this->msg( 'filehist-help' )->parseAsBlock()
. $navLinks . "\n"
. Xml::openElement( 'table', array( 'class' => 'wikitable filehistory' ) ) . "\n"
. '<tr><td></td>'
. ( $this->current->isLocal() && ( $this->getUser()->isAllowedAny( 'delete', 'deletedhistory' ) ) ? '<td></td>' : '' )
- . '<th>' . wfMsgHtml( 'filehist-datetime' ) . '</th>'
- . ( $this->showThumb ? '<th>' . wfMsgHtml( 'filehist-thumb' ) . '</th>' : '' )
- . '<th>' . wfMsgHtml( 'filehist-dimensions' ) . '</th>'
- . '<th>' . wfMsgHtml( 'filehist-user' ) . '</th>'
- . '<th>' . wfMsgHtml( 'filehist-comment' ) . '</th>'
+ . '<th>' . $this->msg( 'filehist-datetime' )->escaped() . '</th>'
+ . ( $this->showThumb ? '<th>' . $this->msg( 'filehist-thumb' )->escaped() . '</th>' : '' )
+ . '<th>' . $this->msg( 'filehist-dimensions' )->escaped() . '</th>'
+ . '<th>' . $this->msg( 'filehist-user' )->escaped() . '</th>'
+ . '<th>' . $this->msg( 'filehist-comment' )->escaped() . '</th>'
. "</tr>\n";
}
if ( !$iscur ) {
$q['oldimage'] = $img;
}
- $row .= Linker::link(
+ $row .= Linker::linkKnown(
$this->title,
- wfMsgHtml( $iscur ? 'filehist-deleteall' : 'filehist-deleteone' ),
- array(), $q, array( 'known' )
+ $this->msg( $iscur ? 'filehist-deleteall' : 'filehist-deleteone' )->escaped(),
+ array(), $q
);
}
# Link to hide content. Don't show useless link to people who cannot hide revisions.
$row .= '<br />';
}
// If file is top revision or locked from this user, don't link
- if ( $iscur || !$file->userCan( File::DELETED_RESTRICTED ) ) {
+ if ( $iscur || !$file->userCan( File::DELETED_RESTRICTED, $user ) ) {
$del = Linker::revDeleteLinkDisabled( $canHide );
} else {
list( $ts, ) = explode( '!', $img, 2 );
// Reversion link/current indicator
$row .= '<td>';
if ( $iscur ) {
- $row .= wfMsgHtml( 'filehist-current' );
- } elseif ( $local && $this->title->quickUserCan( 'edit' )
- && $this->title->quickUserCan( 'upload' )
+ $row .= $this->msg( 'filehist-current' )->escaped();
+ } elseif ( $local && $this->title->quickUserCan( 'edit', $user )
+ && $this->title->quickUserCan( 'upload', $user )
) {
if ( $file->isDeleted( File::DELETED_FILE ) ) {
- $row .= wfMsgHtml( 'filehist-revert' );
+ $row .= $this->msg( 'filehist-revert' )->escaped();
} else {
- $row .= Linker::link(
+ $row .= Linker::linkKnown(
$this->title,
- wfMsgHtml( 'filehist-revert' ),
+ $this->msg( 'filehist-revert' )->escaped(),
array(),
array(
'action' => 'revert',
'oldimage' => $img,
'wpEditToken' => $user->getEditToken( $img )
- ),
- array( 'known', 'noclasses' )
+ )
);
}
}
$selected = "class='filehistory-selected'";
}
$row .= "<td $selected style='white-space: nowrap;'>";
- if ( !$file->userCan( File::DELETED_FILE ) ) {
+ if ( !$file->userCan( File::DELETED_FILE, $user ) ) {
# Don't link to unviewable files
- $row .= '<span class="history-deleted">' . $lang->timeanddate( $timestamp, true ) . '</span>';
+ $row .= '<span class="history-deleted">' . $lang->userTimeAndDate( $timestamp, $user ) . '</span>';
} elseif ( $file->isDeleted( File::DELETED_FILE ) ) {
if ( $local ) {
$this->preventClickjacking();
$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
# Make a link to review the image
- $url = Linker::link(
+ $url = Linker::linkKnown(
$revdel,
- $lang->timeanddate( $timestamp, true ),
+ $lang->userTimeAndDate( $timestamp, $user ),
array(),
array(
'target' => $this->title->getPrefixedText(),
'file' => $img,
'token' => $user->getEditToken( $img )
- ),
- array( 'known', 'noclasses' )
+ )
);
} else {
- $url = $lang->timeanddate( $timestamp, true );
+ $url = $lang->userTimeAndDate( $timestamp, $user );
}
$row .= '<span class="history-deleted">' . $url . '</span>';
} else {
$url = $iscur ? $this->current->getUrl() : $this->current->getArchiveUrl( $img );
- $row .= Xml::element( 'a', array( 'href' => $url ), $lang->timeanddate( $timestamp, true ) );
+ $row .= Xml::element( 'a', array( 'href' => $url ), $lang->userTimeAndDate( $timestamp, $user ) );
}
$row .= "</td>";
// Image dimensions + size
$row .= '<td>';
$row .= htmlspecialchars( $file->getDimensionsString() );
- $row .= $this->getContext()->msg( 'word-separator' )->plain();
+ $row .= $this->msg( 'word-separator' )->plain();
$row .= '<span style="white-space: nowrap;">';
- $row .= $this->getContext()->msg( 'parentheses' )->rawParams( Linker::formatSize( $file->getSize() ) )->plain();
+ $row .= $this->msg( 'parentheses' )->rawParams( Linker::formatSize( $file->getSize() ) )->plain();
$row .= '</span>';
$row .= '</td>';
$row .= '<td>';
// Hide deleted usernames
if ( $file->isDeleted( File::DELETED_USER ) ) {
- $row .= '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
+ $row .= '<span class="history-deleted">' . $this->msg( 'rev-deleted-user' )->escaped() . '</span>';
} else {
if ( $local ) {
$row .= Linker::userLink( $userId, $userText );
- $row .= $this->getContext()->msg( 'word-separator' )->plain();
+ $row .= $this->msg( 'word-separator' )->plain();
$row .= '<span style="white-space: nowrap;">';
$row .= Linker::userToolLinks( $userId, $userText );
$row .= '</span>';
// Don't show deleted descriptions
if ( $file->isDeleted( File::DELETED_COMMENT ) ) {
- $row .= '<td><span class="history-deleted">' . wfMsgHtml( 'rev-deleted-comment' ) . '</span></td>';
+ $row .= '<td><span class="history-deleted">' . $this->msg( 'rev-deleted-comment' )->escaped() . '</span></td>';
} else {
$row .= '<td dir="' . $wgContLang->getDir() . '">' . Linker::formatComment( $description, $this->title ) . '</td>';
}
*/
protected function getThumbForLine( $file ) {
$lang = $this->getLanguage();
- if ( $file->allowInlineDisplay() && $file->userCan( File::DELETED_FILE ) && !$file->isDeleted( File::DELETED_FILE ) ) {
+ $user = $this->getUser();
+ if ( $file->allowInlineDisplay() && $file->userCan( File::DELETED_FILE,$user )
+ && !$file->isDeleted( File::DELETED_FILE ) )
+ {
$params = array(
'width' => '120',
'height' => '120',
$thumbnail = $file->transform( $params );
$options = array(
- 'alt' => wfMsg( 'filehist-thumbtext',
- $lang->timeanddate( $timestamp, true ),
- $lang->date( $timestamp, true ),
- $lang->time( $timestamp, true ) ),
+ 'alt' => $this->msg( 'filehist-thumbtext',
+ $lang->userTimeAndDate( $timestamp, $user ),
+ $lang->userDate( $timestamp, $user ),
+ $lang->userTime( $timestamp, $user ) )->text(),
'file-link' => true,
);
if ( !$thumbnail ) {
- return wfMsgHtml( 'filehist-nothumb' );
+ return $this->msg( 'filehist-nothumb' )->escaped();
}
return $thumbnail->toHtml( $options );
} else {
- return wfMsgHtml( 'filehist-nothumb' );
+ return $this->msg( 'filehist-nothumb' )->escaped();
}
}