Postgres: make sure ar_len is added when updating, alpha stuff in updaters.inc

[lhc/web/wiklou.git] / includes / SpecialUnusedimages.php

diff --git a/includes/SpecialUnusedimages.php b/includes/SpecialUnusedimages.php
index a2fa848..35e9ca9 100644 (file)
--- a/includes/SpecialUnusedimages.php
+++ b/includes/SpecialUnusedimages.php
@@ -1,23 +1,18 @@
 <?php
 /**
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
-/** */
-require_once("QueryPage.php");
-
 /**
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 class UnusedimagesPage extends QueryPage {
 
        function getName() {
                return 'Unusedimages';
        }
-       
+
        function sortDescending() {
                return false;
        }
@@ -25,44 +20,52 @@ class UnusedimagesPage extends QueryPage {
 
        function getSQL() {
                global $wgCountCategorizedImagesAsUsed;
-               $dbr =& wfGetDB( DB_SLAVE );
-               
+               $dbr = wfGetDB( DB_SLAVE );
+
                if ( $wgCountCategorizedImagesAsUsed ) {
-                       extract( $dbr->tableNames( 'page', 'image', 'imagelinks', 'categorylinks' ) );
-               
+                       list( $page, $image, $imagelinks, $categorylinks ) = $dbr->tableNamesN( 'page', 'image', 'imagelinks', 'categorylinks' );
+
                        return 'SELECT img_name as title, img_user, img_user_text, img_timestamp as value, img_description
                                        FROM ((('.$page.' AS I LEFT JOIN '.$categorylinks.' AS L ON I.page_id = L.cl_from)
                                                LEFT JOIN '.$imagelinks.' AS P ON I.page_title = P.il_to)
                                                INNER JOIN '.$image.' AS G ON I.page_title = G.img_name)
                                        WHERE I.page_namespace = '.NS_IMAGE.' AND L.cl_from IS NULL AND P.il_to IS NULL';
                } else {
-                       extract( $dbr->tableNames( 'image','imagelinks' ) );
-               
+                       list( $image, $imagelinks ) = $dbr->tableNamesN( 'image','imagelinks' );
+
                        return 'SELECT img_name as title, img_user, img_user_text, img_timestamp as value, img_description' .
                        ' FROM '.$image.' LEFT JOIN '.$imagelinks.' ON img_name=il_to WHERE il_to IS NULL ';
                }
        }
-       
+
        function formatResult( $skin, $result ) {
                global $wgLang, $wgContLang;
                $title = Title::makeTitle( NS_IMAGE, $result->title );
-               
+
                $imageUrl = htmlspecialchars( Image::imageUrl( $result->title ) );
+               $dirmark = $wgContLang->getDirMark(); // To keep text in correct order
+
                $return =
                # The 'desc' linking to the image page
-               '('.$skin->makeKnownLinkObj( $title, wfMsg('imgdesc') ).') '
+               '('.$skin->makeKnownLinkObj( $title, wfMsg('imgdesc') ).') ' . $dirmark .
+
                # Link to the image itself
-               . '<a href="' . $imageUrl . '">' . htmlspecialchars( $title->getText() ) . '</a>'
+               '<a href="' . $imageUrl . '">' . htmlspecialchars( $title->getText() ) .
+                       '</a> . . ' . $dirmark .
+
                # Last modified date
-               . ' . . '.$wgLang->timeanddate($result->value)
+               $wgLang->timeanddate($result->value) . ' . . ' . $dirmark .
+
                # Link to username
-               . ' . . '.$skin->makeLinkObj( Title::makeTitle( NS_USER, $result->img_user_text ), $result->img_user_text)
+               $skin->makeLinkObj( Title::makeTitle( NS_USER, $result->img_user_text ),
+                       $result->img_user_text) . $dirmark .
+
                # If there is a description, show it
-               . $skin->commentBlock( $wgContLang->convert( $result->img_description ) );
-               
+               $skin->commentBlock( $wgContLang->convert( $result->img_description ) );
+
                return $return;
        }
-       
+
        function getPageHeader() {
                return wfMsg( "unusedimagestext" );
        }