From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 23 Aug 2005 20:38:46 +0000 (+0000)
Subject: * Fix table prefix usage in Block::enumBlocks
X-Git-Tag: 1.6.0~1828
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=23ec039bda0377d57b7793daa132e4dc57081737;p=lhc%2Fweb%2Fwiklou.git

* Fix table prefix usage in Block::enumBlocks
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9a6c466d2a..5e36481c1a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -48,6 +48,7 @@ Misc work going on.....
 * Move ArticleSave hook execution into Article insert/update functions,
   so they get called on non-EditPage actions that use these functions
   to create or update pages.
+* Fix table prefix usage in Block::enumBlocks
 
 
 === Caveats ===
diff --git a/includes/Block.php b/includes/Block.php
index 84b24752c6..721b1f7fa3 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -206,7 +206,7 @@ class Block
 
 		extract( $db->tableNames( 'ipblocks', 'user' ) );
 
-		$sql = "SELECT ipblocks.*,user_name FROM $ipblocks,$user " .
+		$sql = "SELECT $ipblocks.*,user_name FROM $ipblocks,$user " .
 			"WHERE user_id=ipb_by $cond ORDER BY ipb_timestamp DESC $options";
 		$res = $db->query( $sql, 'Block::enumBans' );
 		$num_rows = $db->numRows( $res );