From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Tue, 16 Sep 2008 12:47:44 +0000 (+0000)
Subject: * Remove unneeded code
X-Git-Tag: 1.31.0-rc.0~45267
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=399956f4209406fa49898022e34a9741d2c7035f;p=lhc%2Fweb%2Fwiklou.git

* Remove unneeded code
* Whitespace
---

diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index bc80c2b2d4..ae144d7d07 100644
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -113,8 +113,8 @@ class FileDeleteForm {
 				}
 			}
 		}
-		if( $status->isGood() ) wfRunHooks('FileDeleteComplete', array(
-			&$file, &$oldimage, &$article, &$wgUser, &$reason));
+		if( $status->isGood() ) 
+			wfRunHooks('FileDeleteComplete', array( &$file, &$oldimage, &$article, &$wgUser, &$reason));
 
 		return $status;
 	}
diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php
index 65f4efc09f..f942d43266 100644
--- a/includes/filerepo/LocalFile.php
+++ b/includes/filerepo/LocalFile.php
@@ -1365,7 +1365,7 @@ class LocalFileDeleteBatch {
 			$dbw->delete( 'oldimage',
 				array(
 					'oi_name' => $this->file->getName(),
-					'oi_archive_name IN (' . $dbw->makeList( array_keys( $oldRels ) ) . ')'
+					'oi_archive_name' => array_keys( $oldRels )
 				), __METHOD__ );
 		}
 		if ( $deleteCurrent ) {