diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
| commit | 6dc1997577fab2c366781fd7048144935afa0012 (patch) | |
| tree | 8918d28c7ab4342f0738985e37af1dfc42d0e93a /includes/filebackend/lockmanager/FSLockManager.php | |
| parent | 150f94f051128f367bc89f6b7e5f57eb2a69fc62 (diff) | |
| parent | fa89acd685cb09cdbe1c64cbb721ec64975bbbc1 (diff) | |
Merge commit 'fa89acd'
# Conflicts:
# .gitignore
# extensions/ArchInterWiki.sql
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 |