Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing

1 files changed, 15 insertions, 17 deletions

diff --git a/includes/specials/SpecialUncategorizedimages.php b/includes/specials/SpecialUncategorizedimages.php
index c4254039..3efed747 100644
--- a/includes/specials/SpecialUncategorizedimages.php
+++ b/includes/specials/SpecialUncategorizedimages.php
@@ -27,10 +27,11 @@
  *
  * @ingroup SpecialPage
  */
+// @todo FIXME: Use an instance of UncategorizedPagesPage or something
 class UncategorizedImagesPage extends ImageQueryPage {
 
-	function getName() {
-		return 'Uncategorizedimages';
+	function __construct( $name = 'Uncategorizedimages' ) {
+		parent::__construct( $name );
 	}
 
 	function sortDescending() {
@@ -45,21 +46,18 @@ class UncategorizedImagesPage extends ImageQueryPage {
 		return false;
 	}
 
-	function getSQL() {
-		$dbr = wfGetDB( DB_SLAVE );
-		list( $page, $categorylinks ) = $dbr->tableNamesN( 'page', 'categorylinks' );
-		$ns = NS_FILE;
-
-		return "SELECT 'Uncategorizedimages' AS type, page_namespace AS namespace,
-				page_title AS title, page_title AS value
-				FROM {$page} LEFT JOIN {$categorylinks} ON page_id = cl_from
-				WHERE cl_from IS NULL AND page_namespace = {$ns} AND page_is_redirect = 0";
+	function getQueryInfo() {
+		return array (
+			'tables' => array( 'page', 'categorylinks' ),
+			'fields' => array( 'page_namespace AS namespace',
+					'page_title AS title',
+					'page_title AS value' ),
+			'conds' => array( 'cl_from IS NULL',
+					'page_namespace' => NS_FILE,
+					'page_is_redirect' => 0 ),
+			'join_conds' => array( 'categorylinks' => array(
+					'LEFT JOIN', 'cl_from=page_id' ) )
+		);
 	}
 
 }
-
-function wfSpecialUncategorizedimages() {
-	$uip = new UncategorizedImagesPage();
-	list( $limit, $offset ) = wfCheckLimits();
-	return $uip->doQuery( $offset, $limit );
-}