From 8682b8b90e77feac03ffce4e601e3ceea5d2cdfe Mon Sep 17 00:00:00 2001 From: Alex Monk Date: Tue, 15 Sep 2015 23:38:15 +0100 Subject: [PATCH] Purge remaining oversight references from code i18n change coming in a separate commit Change-Id: I46b9311cd01e95e524587ce40dcbae62f58dc5a8 --- includes/page/WikiPage.php | 2 +- includes/revisiondelete/RevDelList.php | 2 +- includes/specials/SpecialBlock.php | 6 +++--- maintenance/dictionary/mediawiki.dic | 5 ----- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 657c4d0f5c..69b675b462 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -2854,7 +2854,7 @@ class WikiPage implements Page, IDBAccessObject { // Clone the title, so we have the information we need when we log $logTitle = clone $this->mTitle; - // Log the deletion, if the page was suppressed, log it at Oversight instead + // Log the deletion, if the page was suppressed, put it in the suppression log instead $logtype = $suppress ? 'suppress' : 'delete'; $logEntry = new ManualLogEntry( $logtype, 'delete' ); diff --git a/includes/revisiondelete/RevDelList.php b/includes/revisiondelete/RevDelList.php index 837557cb53..7aac3b8925 100644 --- a/includes/revisiondelete/RevDelList.php +++ b/includes/revisiondelete/RevDelList.php @@ -251,7 +251,7 @@ abstract class RevDelList extends RevisionListBase { if ( !$field ) { throw new MWException( "Bad log URL param type!" ); } - // Put things hidden from sysops in the oversight log + // Put things hidden from sysops in the suppression log if ( ( $params['newBits'] | $params['oldBits'] ) & $this->getSuppressBit() ) { $logType = 'suppress'; } else { diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php index e0f35c65dd..cd6cc76e8e 100644 --- a/includes/specials/SpecialBlock.php +++ b/includes/specials/SpecialBlock.php @@ -662,8 +662,8 @@ class SpecialBlock extends FormSpecialPage { if ( $data['HideUser'] ) { if ( !$performer->isAllowed( 'hideuser' ) ) { # this codepath is unreachable except by a malicious user spoofing forms, - # or by race conditions (user has oversight and sysop, loads block form, - # and is de-oversighted before submission); so need to fail completely + # or by race conditions (user has hideuser and block rights, loads block form, + # and loses hideuser rights before submission); so need to fail completely # rather than just silently disable hiding return array( 'badaccess-group0' ); } @@ -787,7 +787,7 @@ class SpecialBlock extends FormSpecialPage { $logParams['5::duration'] = $data['Expiry']; $logParams['6::flags'] = self::blockLogFlags( $data, $type ); - # Make log entry, if the name is hidden, put it in the oversight log + # Make log entry, if the name is hidden, put it in the suppression log $log_type = $data['HideUser'] ? 'suppress' : 'block'; $logEntry = new ManualLogEntry( $log_type, $logaction ); $logEntry->setTarget( Title::makeTitle( NS_USER, $target ) ); diff --git a/maintenance/dictionary/mediawiki.dic b/maintenance/dictionary/mediawiki.dic index f19c64fa0d..8e4e5314ee 100644 --- a/maintenance/dictionary/mediawiki.dic +++ b/maintenance/dictionary/mediawiki.dic @@ -3001,9 +3001,6 @@ outreachwiki over overridable override -oversight -oversighted -oversighter overwrite overwroteimage own @@ -4244,8 +4241,6 @@ unmakesafe unmark unmerge unmodified -unoversight -unoversighted unpadded unpatrolled unpatrolledletter -- 2.20.1