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/FileOp.php | |
| parent | 150f94f051128f367bc89f6b7e5f57eb2a69fc62 (diff) | |
| parent | fa89acd685cb09cdbe1c64cbb721ec64975bbbc1 (diff) | |
Merge commit 'fa89acd'
# Conflicts:
# .gitignore
# extensions/ArchInterWiki.sql
Diffstat (limited to 'includes/filebackend/FileOp.php')
| -rw-r--r-- | includes/filebackend/FileOp.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/filebackend/FileOp.php b/includes/filebackend/FileOp.php index 66d87943..5d4e8e11 100644 --- a/includes/filebackend/FileOp.php +++ b/includes/filebackend/FileOp.php @@ -577,9 +577,9 @@ class StoreFileOp extends FileOp { } protected function getSourceSha1Base36() { - wfSuppressWarnings(); + MediaWiki\suppressWarnings(); $hash = sha1_file( $this->params['src'] ); - wfRestoreWarnings(); + MediaWiki\restoreWarnings(); if ( $hash !== false ) { $hash = wfBaseConvert( $hash, 16, 36, 31 ); } |