Follow up r64936. Even better, provide the bug number and imagemagick doc page.

[lhc/web/wiklou.git] / includes / specials / SpecialListfiles.php

diff --git a/includes/specials/SpecialListfiles.php b/includes/specials/SpecialListfiles.php
index 4ee2941..024f6f9 100644 (file)
--- a/includes/specials/SpecialListfiles.php
+++ b/includes/specials/SpecialListfiles.php
@@ -34,13 +34,11 @@ class ImageListPager extends TablePager {
                }
                $search = $wgRequest->getText( 'ilsearch' );
                if ( $search != '' && !$wgMiserMode ) {
-                       $nt = Title::newFromUrl( $search );
+                       $nt = Title::newFromURL( $search );
                        if( $nt ) {
                                $dbr = wfGetDB( DB_SLAVE );
-                               $m = $dbr->strencode( strtolower( $nt->getDBkey() ) );
-                               $m = str_replace( "%", "\\%", $m );
-                               $m = str_replace( "_", "\\_", $m );
-                               $this->mQueryConds = array( "LOWER(img_name) LIKE '%{$m}%'" );
+                               $this->mQueryConds = array( 'LOWER(img_name)' . $dbr->buildLike( $dbr->anyString(), 
+                                       strtolower( $nt->getDBkey() ), $dbr->anyString() ) );
                        }
                }
 
@@ -49,6 +47,7 @@ class ImageListPager extends TablePager {
 
        function getFieldNames() {
                if ( !$this->mFieldNames ) {
+                       global $wgMiserMode;
                        $this->mFieldNames = array(
                                'img_timestamp' => wfMsg( 'listfiles_date' ),
                                'img_name' => wfMsg( 'listfiles_name' ),
@@ -56,6 +55,9 @@ class ImageListPager extends TablePager {
                                'img_size' => wfMsg( 'listfiles_size' ),
                                'img_description' => wfMsg( 'listfiles_description' ),
                        );
+                       if( !$wgMiserMode ) {
+                               $this->mFieldNames['count'] = wfMsg( 'listfiles_count' );
+                       }
                }
                return $this->mFieldNames;
        }
@@ -66,13 +68,36 @@ class ImageListPager extends TablePager {
        }
 
        function getQueryInfo() {
-               $fields = $this->getFieldNames();
-               $fields = array_keys( $fields );
+               $tables = array( 'image' );
+               $fields = array_keys( $this->getFieldNames() );
                $fields[] = 'img_user';
+               $options = $join_conds = array();
+
+               # Depends on $wgMiserMode
+               if( isset( $this->mFieldNames['count'] ) ) {
+                       $tables[] = 'oldimage';
+
+                       # Need to rewrite this one
+                       foreach ( $fields as &$field )
+                               if ( $field == 'count' )
+                                       $field = 'COUNT(oi_archive_name) as count';
+                       unset( $field );
+
+                       $dbr = wfGetDB( DB_SLAVE );
+                       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" );
+                       }
+                       $join_conds = array( 'oldimage' => array( 'LEFT JOIN', 'oi_name = img_name' ) );
+               }
                return array(
-                       'tables' => 'image',
-                       'fields' => $fields,
-                       'conds' => $this->mQueryConds
+                       'tables'     => $tables,
+                       'fields'     => $fields,
+                       'conds'      => $this->mQueryConds,
+                       'options'    => $options,
+                       'join_conds' => $join_conds
                );
        }
 
@@ -100,21 +125,23 @@ class ImageListPager extends TablePager {
                global $wgLang;
                switch ( $field ) {
                        case 'img_timestamp':
-                               return $wgLang->timeanddate( $value, true );
+                               return htmlspecialchars( $wgLang->timeanddate( $value, true ) );
                        case 'img_name':
                                static $imgfile = null;
                                if ( $imgfile === null ) $imgfile = wfMsg( 'imgfile' );
 
                                $name = $this->mCurrentRow->img_name;
-                               $link = $this->getSkin()->makeKnownLinkObj( Title::makeTitle( NS_FILE, $name ), $value );
+                               $link = $this->getSkin()->linkKnown( Title::makeTitle( NS_FILE, $name ), htmlspecialchars( $value ) );
                                $image = wfLocalFile( $value );
                                $url = $image->getURL();
                                $download = Xml::element('a', array( 'href' => $url ), $imgfile );
                                return "$link ($download)";
                        case 'img_user_text':
                                if ( $this->mCurrentRow->img_user ) {
-                                       $link = $this->getSkin()->makeLinkObj( Title::makeTitle( NS_USER, $value ),
-                                               htmlspecialchars( $value ) );
+                                       $link = $this->getSkin()->link(
+                                               Title::makeTitle( NS_USER, $value ),
+                                               htmlspecialchars( $value )
+                                       );
                                } else {
                                        $link = htmlspecialchars( $value );
                                }
@@ -123,14 +150,16 @@ class ImageListPager extends TablePager {
                                return $this->getSkin()->formatSize( $value );
                        case 'img_description':
                                return $this->getSkin()->commentBlock( $value );
+                       case 'count':
+                               return intval($value)+1;
                }
        }
 
        function getForm() {
-               global $wgRequest, $wgMiserMode;
+               global $wgRequest, $wgScript, $wgMiserMode;
                $search = $wgRequest->getText( 'ilsearch' );
 
-               $s = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $this->getTitle()->getLocalURL(), 'id' => 'mw-listfiles-form' ) ) .
+               $s = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript, 'id' => 'mw-listfiles-form' ) ) .
                        Xml::openElement( 'fieldset' ) .
                        Xml::element( 'legend', null, wfMsg( 'listfiles' ) ) .
                        Xml::tags( 'label', null, wfMsgHtml( 'table_pager_limit', $this->getLimitSelect() ) );