Use 'suppress' right rather than 'oversight'

diff --git a/includes/Article.php b/includes/Article.php
index 4552b81..1fb6c2b 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -2300,7 +2300,7 @@ class Article {
                Article::onArticleDelete( $this->mTitle );
 
                # Log the deletion, if the page was suppressed, log it at Oversight instead
-               $logtype = $suppress ? 'oversight' : 'delete';
+               $logtype = $suppress ? 'suppress' : 'delete';
                $log = new LogPage( $logtype );
                $log->addEntry( 'delete', $this->mTitle, $reason );
 

diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index 32bc430..e3b828e 100644 (file)
--- a/includes/SpecialBlockip.php
+++ b/includes/SpecialBlockip.php
@@ -359,7 +359,7 @@ class IPBlockForm {
                        $logParams[] = $this->blockLogFlags();
 
                        # Make log entry, if the name is hidden, put it in the oversight log
-                       $log_type = ($this->BlockHideName) ? 'oversight' : 'block';
+                       $log_type = ($this->BlockHideName) ? 'suppress' : 'block';
                        $log = new LogPage( $log_type );
                        $log->addEntry( 'block', Title::makeTitle( NS_USER, $this->BlockAddress ),
                          $reasonstr, $logParams );

diff --git a/includes/SpecialIpblocklist.php b/includes/SpecialIpblocklist.php
index 5abb6bb..7121fb9 100644 (file)
--- a/includes/SpecialIpblocklist.php
+++ b/includes/SpecialIpblocklist.php
@@ -236,7 +236,7 @@ class IPUnblockForm {
                $conds = array();
                $matches = array();
                // Is user allowed to see all the blocks?
-               if ( !$wgUser->isAllowed( 'oversight' ) )
+               if ( !$wgUser->isAllowed( 'suppress' ) )
                        $conds['ipb_deleted'] = 0;
                if ( $this->ip == '' ) {
                        // No extra conditions

diff --git a/includes/SpecialRevisiondelete.php b/includes/SpecialRevisiondelete.php
index 19cbba5..70cf53b 100644 (file)
--- a/includes/SpecialRevisiondelete.php
+++ b/includes/SpecialRevisiondelete.php
@@ -455,7 +455,7 @@ class RevisionDeleteForm {
                }
                foreach( $this->events as $logid ) {
                        // Don't hide from oversight log!!!
-                       if( !isset( $logRows[$logid] ) || $logRows[$logid]->log_type=='oversight' ) {
+                       if( !isset( $logRows[$logid] ) || $logRows[$logid]->log_type=='suppress' ) {
                                $wgOut->showErrorPage( 'revdelete-nooldid-title', 'revdelete-nooldid-text' );
                                return;
                        } else if( !LogPage::userCan( $logRows[$logid],Revision::DELETED_RESTRICTED) ) {
@@ -1071,7 +1071,7 @@ class RevisionDeleter {
                                $success = false;
                                continue; // Must exist
                        } else if( !LogPage::userCan($logRows[$logid], Revision::DELETED_RESTRICTED)
-                                || $logRows[$logid]->log_type=='oversight' ) {
+                                || $logRows[$logid]->log_type == 'suppress' ) {
                        // Don't hide from oversight log!!!
                        $userAllowedAll=false;
                        continue;
@@ -1334,7 +1334,7 @@ class RevisionDeleter {
         */
        function updateLog( $title, $count, $nbitfield, $obitfield, $comment, $target, $param, $items = array() ) {
                // Put things hidden from sysops in the oversight log
-               $logtype = ( ($nbitfield | $obitfield) & Revision::DELETED_RESTRICTED ) ? 'oversight' : 'delete';
+               $logtype = ( ($nbitfield | $obitfield) & Revision::DELETED_RESTRICTED ) ? 'suppress' : 'delete';
                $log = new LogPage( $logtype );
                // FIXME: do this better
                if( $param=='logid' ) {

diff --git a/includes/SpecialUndelete.php b/includes/SpecialUndelete.php
index 2f56ae8..ef7944b 100644 (file)
--- a/includes/SpecialUndelete.php
+++ b/includes/SpecialUndelete.php
@@ -587,7 +587,7 @@ class UndeleteForm {
                $this->mPreview = $request->getCheck( 'preview' ) && $posted;
                $this->mDiff = $request->getCheck( 'diff' );
                $this->mComment = $request->getText( 'wpComment' );
-               $this->mUnsuppress = $request->getVal( 'wpUnsuppress' ) && $wgUser->isAllowed( 'oversight' );
+               $this->mUnsuppress = $request->getVal( 'wpUnsuppress' ) && $wgUser->isAllowed( 'suppress' );
                
                if( $par != "" ) {
                        $this->mTarget = $par;
@@ -972,7 +972,7 @@ class UndeleteForm {
                        # Format the user-visible controls (comment field, submission button)
                        # in a nice little table
                        $align = $wgContLang->isRtl() ? 'left' : 'right';
-                       if( $wgUser->isAllowed( 'oversight' ) ) {
+                       if( $wgUser->isAllowed( 'suppress' ) ) {
                                $unsuppressBox = 
                                        "<tr>
                                                <td>&nbsp;</td>

diff --git a/includes/api/ApiQueryBlocks.php b/includes/api/ApiQueryBlocks.php
index 69da27c..ad13eb2 100644 (file)
--- a/includes/api/ApiQueryBlocks.php
+++ b/includes/api/ApiQueryBlocks.php
@@ -90,7 +90,7 @@ class ApiQueryBlocks extends ApiQueryBase {
                        $this->addWhere(array('ipb_id' => $params['ids']));
                if(isset($params['users']))
                        $this->addWhere(array('ipb_address' => $params['users']));
-               if(!$wgUser->isAllowed('oversight'))
+               if(!$wgUser->isAllowed('suppress'))
                        $this->addWhere(array('ipb_deleted' => 0));
 
                // Purge expired entries on one in every 10 queries