Removed usage of error suppression operator in Special:LockDB and Special:UnlockDB

diff --git a/includes/specials/SpecialLockdb.php b/includes/specials/SpecialLockdb.php
index aad3cea..f8ab57b 100644 (file)
--- 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 c71b554..88cd50e 100644 (file)
--- 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;
                }