disallow embedded line breaks in ISBNs; allowing them breaks things in a most interes...

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

diff --git a/includes/SpecialUnusedimages.php b/includes/SpecialUnusedimages.php
index fa76c57..75d702c 100644 (file)
--- a/includes/SpecialUnusedimages.php
+++ b/includes/SpecialUnusedimages.php
@@ -5,9 +5,6 @@
  * @subpackage SpecialPage
  */
 
-/** */
-require_once("QueryPage.php");
-
 /**
  * @package MediaWiki
  * @subpackage SpecialPage
@@ -28,7 +25,7 @@ class UnusedimagesPage extends QueryPage {
                $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)
@@ -36,7 +33,7 @@ class UnusedimagesPage extends QueryPage {
                                                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 ';