From 515aff5eded0e39642782cab9a6fb7b614c2682c Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 17 Apr 2008 14:48:28 +0000
Subject: [PATCH] Remove temp $wgAllowLogDeletion var

---
 includes/DefaultSettings.php       |  3 ---
 includes/LogEventsList.php         | 10 +---------
 includes/SpecialRevisiondelete.php |  4 ++--
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 0bb148e4be..7d2dfd223e 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1165,9 +1165,6 @@ $wgGroupPermissions['bureaucrat']['userrights']  = true;
 // For private log access
 #$wgGroupPermissions['suppress']['suppress'] = true;
 
-// Pending WMF schema change...temporary variable
-$wgAllowLogDeletion = false;
-
 /**
  * The developer group is deprecated, but can be activated if need be
  * to use the 'lockdb' and 'unlockdb' special pages. Those require
diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index a2332c452a..6c4627923a 100644
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -305,11 +305,6 @@ class LogEventsList {
 	 * @return string
 	 */
 	private function showhideLinks( $row ) {
-		global $wgAllowLogDeletion;
-
-		if( !$wgAllowLogDeletion )
-			return "";
-
 		$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
 		// If event was hidden from sysops
 		if( !self::userCan( $row, LogPage::DELETED_RESTRICTED ) ) {
@@ -572,9 +567,6 @@ 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';
 		# Don't use the wrong logging index
 		if( $this->title || $this->pattern || $this->user ) {
 			$index = array( 'USE INDEX' => array( 'logging' => array('page_time','user_time') ) );
@@ -586,7 +578,7 @@ class LogPager extends ReverseChronologicalPager {
 		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', 'user_editcount' ),
+				'log_comment', 'log_id', 'log_deleted', 'log_timestamp', 'user_name', 'user_editcount' ),
 			'conds' => $this->mConds,
 			'options' => $index
 		);
diff --git a/includes/SpecialRevisiondelete.php b/includes/SpecialRevisiondelete.php
index 6fb46f0ffa..49538080e4 100644
--- a/includes/SpecialRevisiondelete.php
+++ b/includes/SpecialRevisiondelete.php
@@ -8,12 +8,12 @@
  */
 
 function wfSpecialRevisiondelete( $par = null ) {
-	global $wgOut, $wgRequest, $wgUser, $wgAllowLogDeletion;
+	global $wgOut, $wgRequest, $wgUser;
 	# Handle our many different possible input types
 	$target = $wgRequest->getText( 'target' );
 	$oldid = $wgRequest->getArray( 'oldid' );
 	$artimestamp = $wgRequest->getArray( 'artimestamp' );
-	$logid = $wgAllowLogDeletion ? $wgRequest->getArray( 'logid' ) : '';
+	$logid = $wgRequest->getArray( 'logid' );
 	$img = $wgRequest->getArray( 'oldimage' );
 	$fileid = $wgRequest->getArray( 'fileid' );
 	# For reviewing deleted files...
-- 
2.20.1