var $mSearch = '';
var $mIncluding = false;
- function __construct( RequestContext $context, $userName = null, $search = '', $including = false ) {
+ function __construct( IContextSource $context, $userName = null, $search = '', $including = false ) {
global $wgMiserMode;
$this->mIncluding = $including;
if ( !$this->mFieldNames ) {
global $wgMiserMode;
$this->mFieldNames = array(
- 'img_timestamp' => wfMsg( 'listfiles_date' ),
- 'img_name' => wfMsg( 'listfiles_name' ),
- 'thumb' => wfMsg( 'listfiles_thumb' ),
- 'img_size' => wfMsg( 'listfiles_size' ),
- 'img_user_text' => wfMsg( 'listfiles_user' ),
- 'img_description' => wfMsg( 'listfiles_description' ),
+ 'img_timestamp' => $this->msg( 'listfiles_date' )->text(),
+ 'img_name' => $this->msg( 'listfiles_name' )->text(),
+ 'thumb' => $this->msg( 'listfiles_thumb' )->text(),
+ 'img_size' => $this->msg( 'listfiles_size' )->text(),
+ 'img_user_text' => $this->msg( 'listfiles_user' )->text(),
+ 'img_description' => $this->msg( 'listfiles_description' )->text(),
);
if( !$wgMiserMode ) {
- $this->mFieldNames['count'] = wfMsg( 'listfiles_count' );
+ $this->mFieldNames['count'] = $this->msg( 'listfiles_count' )->text();
}
}
return $this->mFieldNames;
if( $dbr->implicitGroupby() ) {
$options = array( 'GROUP BY' => 'img_name' );
} else {
- $columnlist = implode( ',',
- preg_grep( '/^img/', array_keys( $this->getFieldNames() ) ) );
- $options = array( 'GROUP BY' => "img_user, $columnlist" );
+ $columnlist = preg_grep( '/^img/', array_keys( $this->getFieldNames() ) );
+ $options = array( 'GROUP BY' => array_merge( array( 'img_user' ), $columnlist ) );
}
$join_conds = array( 'oldimage' => array( 'LEFT JOIN', 'oi_name = img_name' ) );
}
$thumb = $file->transform( array( 'width' => 180, 'height' => 360 ) );
return $thumb->toHtml( array( 'desc-link' => true ) );
case 'img_timestamp':
- return htmlspecialchars( $this->getLang()->timeanddate( $value, true ) );
+ return htmlspecialchars( $this->getLanguage()->userTimeAndDate( $value, $this->getUser() ) );
case 'img_name':
static $imgfile = null;
- if ( $imgfile === null ) $imgfile = wfMsg( 'imgfile' );
+ if ( $imgfile === null ) $imgfile = $this->msg( 'imgfile' )->text();
// Weird files can maybe exist? Bug 22227
$filePage = Title::makeTitleSafe( NS_FILE, $value );
array( 'href' => wfLocalFile( $filePage )->getURL() ),
$imgfile
);
- return "$link ($download)";
+ $download = $this->msg( 'parentheses' )->rawParams( $download )->escaped();
+ return "$link $download";
} else {
return htmlspecialchars( $value );
}
}
return $link;
case 'img_size':
- return htmlspecialchars( $this->getLang()->formatSize( $value ) );
+ return htmlspecialchars( $this->getLanguage()->formatSize( $value ) );
case 'img_description':
return Linker::commentBlock( $value );
case 'count':
) );
return Html::openElement( 'form',
array( 'method' => 'get', 'action' => $wgScript, 'id' => 'mw-listfiles-form' ) ) .
- Xml::fieldset( wfMsg( 'listfiles' ) ) .
+ Xml::fieldset( $this->msg( 'listfiles' )->text() ) .
Xml::buildForm( $inputForm, 'table_pager_limit_submit' ) .
$this->getHiddenFields( array( 'limit', 'ilsearch', 'user' ) ) .
Html::closeElement( 'fieldset' ) .