From 229b39b139c2f9b259426cc9e47a766d9363ef27 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sun, 15 May 2011 14:48:15 +0000 Subject: [PATCH] Removed usage of error suppression operator in Special:LockDB and Special:UnlockDB --- includes/specials/SpecialLockdb.php | 5 ++++- includes/specials/SpecialUnlockdb.php | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/includes/specials/SpecialLockdb.php b/includes/specials/SpecialLockdb.php index aad3cea41a..f8ab57b25e 100644 --- a/includes/specials/SpecialLockdb.php +++ b/includes/specials/SpecialLockdb.php @@ -109,7 +109,10 @@ class SpecialLockdb extends SpecialPage { $this->showForm( wfMsg( 'locknoconfirm' ) ); return; } - $fp = @fopen( $wgReadOnlyFile, 'w' ); + + wfSuppressWarnings(); + $fp = fopen( $wgReadOnlyFile, 'w' ); + wfRestoreWarnings(); if ( false === $fp ) { # This used to show a file not found error, but the likeliest reason for fopen() diff --git a/includes/specials/SpecialUnlockdb.php b/includes/specials/SpecialUnlockdb.php index c71b554b2a..88cd50e1b4 100644 --- a/includes/specials/SpecialUnlockdb.php +++ b/includes/specials/SpecialUnlockdb.php @@ -104,7 +104,12 @@ class SpecialUnlockdb extends SpecialPage { $this->showForm( wfMsg( 'locknoconfirm' ) ); return; } - if ( @!unlink( $wgReadOnlyFile ) ) { + + wfSuppressWarnings(); + $res = unlink( $wgReadOnlyFile ); + wfRestoreWarnings(); + + if ( !$res ) { $wgOut->showFileDeleteError( $wgReadOnlyFile ); return; } -- 2.20.1