Merge SCHEMA_WORK into HEAD. Lots of changes, some things are probably broken:

* Page moves/overwrites are a little iffy
* Compression might not be working right
* Profit!

1 files changed, 8 insertions, 9 deletions

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 3609c0073be0..e99e046aa332 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -144,11 +144,11 @@ class ImagePage extends Article {
 		$wgOut->addHTML( '<h2>' . wfMsg( 'imagelinks' ) . "</h2>\n" );
 
 		$dbr =& wfGetDB( DB_SLAVE );
-		$cur = $dbr->tableName( 'cur' );
+		$page = $dbr->tableName( 'page' );
 		$imagelinks = $dbr->tableName( 'imagelinks' );
 		
-		$sql = "SELECT cur_namespace,cur_title FROM $imagelinks,$cur WHERE il_to=" .
-		  $dbr->addQuotes( $this->mTitle->getDBkey() ) . " AND il_from=cur_id"
+		$sql = "SELECT page_namespace,page_title FROM $imagelinks,$page WHERE il_to=" .
+		  $dbr->addQuotes( $this->mTitle->getDBkey() ) . " AND il_from=page_id"
 		  . " LIMIT 500"; # quickie emergency brake
 		$res = $dbr->query( $sql, DB_SLAVE, "Article::imageLinks" );
 
@@ -160,7 +160,7 @@ class ImagePage extends Article {
 
 		$sk = $wgUser->getSkin();
 		while ( $s = $dbr->fetchObject( $res ) ) {
-			$name = Title::MakeTitle( $s->cur_namespace, $s->cur_title );
+			$name = Title::MakeTitle( $s->page_namespace, $s->page_title );
 			$link = $sk->makeKnownLinkObj( $name, "" );
 			$wgOut->addHTML( "<li>{$link}</li>\n" );
 		}
@@ -188,11 +188,10 @@ class ImagePage extends Article {
 
 		# Better double-check that it hasn't been deleted yet!
 		$wgOut->setPagetitle( wfMsg( 'confirmdelete' ) );
-		if ( !is_null( $image ) ) {
-			if ( '' == trim( $image ) ) {
-				$wgOut->fatalError( wfMsg( 'cannotdelete' ) );
-				return;
-			}
+		if ( ( !is_null( $image ) )
+		  && ( '' == trim( $image ) ) ) {
+			$wgOut->fatalError( wfMsg( 'cannotdelete' ) );
+			return;
 		}
 		
 		# Deleting old images doesn't require confirmation