From: Daniel Friesen <dantman@users.mediawiki.org>
Date: Thu, 8 May 2008 09:29:48 +0000 (+0000)
Subject: Ahh great. I mixed up my definition of preg_match's output and thought it was the... 
X-Git-Tag: 1.31.0-rc.0~47825
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=14939d9853ad50d26f24518cc1d5f6f628d80dc9;p=lhc%2Fweb%2Fwiklou.git

Ahh great. I mixed up my definition of preg_match's output and thought it was the one to return an offset, and false on failure.
---

diff --git a/includes/Database.php b/includes/Database.php
index c8711374d9..f2bb4ba569 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -1380,7 +1380,7 @@ class Database {
 		# Note that we use a whitespace test rather than a \b test to avoid
 		# any remote case where a word like on may be inside of a table name
 		# surrounded by symbols which may be considered word breaks.
-		if( preg_match( '/(^|\s)(JOIN|ON)(\s|$)/i', $name ) !== false ) return $name;
+		if( preg_match( '/(^|\s)(JOIN|ON)(\s|$)/i', $name ) !== 0 ) return $name;
 		
 		# Split database and table into proper variables.
 		# We reverse the explode so that database.table and table both output