diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
| commit | a2190ac74dd4d7080b12bab90e552d7aa81209ef (patch) | |
| tree | 8b31f38de9882d18df54cf8d9e0de74167a094eb /includes/filebackend/lockmanager/FSLockManager.php | |
| parent | 15e69f7b20b6596b9148030acce5b59993b95a45 (diff) | |
| parent | 257401d8b2cf661adf36c84b0e3fd1cf85e33c22 (diff) | |
Merge branch 'mw-1.26'
Diffstat (limited to 'includes/filebackend/lockmanager/FSLockManager.php')
| -rw-r--r-- | includes/filebackend/lockmanager/FSLockManager.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/filebackend/lockmanager/FSLockManager.php b/includes/filebackend/lockmanager/FSLockManager.php index bce6b34c..6f46f0e4 100644 --- a/includes/filebackend/lockmanager/FSLockManager.php +++ b/includes/filebackend/lockmanager/FSLockManager.php @@ -117,9 +117,9 @@ class FSLockManager extends LockManager { if ( isset( $this->handles[$path] ) ) { $handle = $this->handles[$path]; } else { - wfSuppressWarnings(); + MediaWiki\suppressWarnings(); $handle = fopen( $this->getLockPath( $path ), 'a+' ); - wfRestoreWarnings(); + MediaWiki\restoreWarnings(); if ( !$handle ) { // lock dir missing? wfMkdirParents( $this->lockDir ); $handle = fopen( $this->getLockPath( $path ), 'a+' ); // try again |