From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Wed, 2 Apr 2008 06:30:31 +0000 (+0000)
Subject: Fake log_id if needed
X-Git-Tag: 1.31.0-rc.0~48681
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=2b3501dc5e1a6b014472edde8931a710d0df4e18;p=lhc%2Fweb%2Fwiklou.git

Fake log_id if needed
---

diff --git a/includes/SpecialLog.php b/includes/SpecialLog.php
index 901b86aea6..338aae09e7 100644
--- a/includes/SpecialLog.php
+++ b/includes/SpecialLog.php
@@ -162,10 +162,13 @@ class LogPager extends ReverseChronologicalPager {
 
 	function getQueryInfo() {
 		$this->mConds[] = 'user_id = log_user';
+		# Hack this until live
+		global $wgAllowLogDeletion;
+		$log_id = $wgAllowLogDeletion ? 'log_id' : '0 AS log_id';
 		return array(
 			'tables' => array( 'logging', 'user' ),
 			'fields' => array( 'log_type', 'log_action', 'log_user', 'log_namespace', 'log_title', 
-				'log_params', 'log_comment', 'log_id', 'log_deleted', 'log_timestamp', 'user_name' ),
+				'log_params', 'log_comment', $log_id, 'log_deleted', 'log_timestamp', 'user_name' ),
 			'conds' => $this->mConds,
 			'options' => array()
 		);