Remove temp $wgAllowLogDeletion var

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 0bb148e..7d2dfd2 100644 (file)
--- 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 a2332c4..6c46279 100644 (file)
--- 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 6fb46f0..4953808 100644 (file)
--- 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...