From: Greg Sabino Mullane <greg@users.mediawiki.org>
Date: Mon, 25 Sep 2006 20:38:00 +0000 (+0000)
Subject: Another attempt at cross-database compatibility; mysql left totally unchanged.
X-Git-Tag: 1.31.0-rc.0~55723
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=782c1c10a30ac56cddb237f963dac89063e15138;p=lhc%2Fweb%2Fwiklou.git

Another attempt at cross-database compatibility; mysql left totally unchanged.
---

diff --git a/includes/SpecialListusers.php b/includes/SpecialListusers.php
index db6434e05a..4668d0c7d7 100644
--- a/includes/SpecialListusers.php
+++ b/includes/SpecialListusers.php
@@ -111,6 +111,7 @@ class ListUsersPage extends QueryPage {
 	}
 
 	function getSQL() {
+		global $wgDBtype;
 		$dbr =& wfGetDB( DB_SLAVE );
 		$user = $dbr->tableName( 'user' );
 		$user_groups = $dbr->tableName( 'user_groups' );
@@ -133,7 +134,9 @@ class ListUsersPage extends QueryPage {
 			"LEFT JOIN $user_groups ON user_id=ug_user " .
 			$this->userQueryWhere( $dbr ) .
 			" GROUP BY user_name";
-
+		if ( $wgDBtype != 'mysql' ) {
+			$sql .= ",user_id";
+		}
 		return $sql;
 	}