diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-17 09:15:42 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-17 09:44:51 +0100 |
commit | a1789ddde42033f1b05cc4929491214ee6e79383 (patch) | |
tree | 63615735c4ddffaaabf2428946bb26f90899f7bf /includes/filebackend/FSFile.php | |
parent | 9e06a62f265e3a2aaabecc598d4bc617e06fa32d (diff) |
Update to MediaWiki 1.26.0
Diffstat (limited to 'includes/filebackend/FSFile.php')
-rw-r--r-- | includes/filebackend/FSFile.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/includes/filebackend/FSFile.php b/includes/filebackend/FSFile.php index 6ee9b2e0..213bb87d 100644 --- a/includes/filebackend/FSFile.php +++ b/includes/filebackend/FSFile.php @@ -75,9 +75,9 @@ class FSFile { * @return string|bool TS_MW timestamp or false on failure */ public function getTimestamp() { - wfSuppressWarnings(); + MediaWiki\suppressWarnings(); $timestamp = filemtime( $this->path ); - wfRestoreWarnings(); + MediaWiki\restoreWarnings(); if ( $timestamp !== false ) { $timestamp = wfTimestamp( TS_MW, $timestamp ); } @@ -200,13 +200,12 @@ class FSFile { public function getSha1Base36( $recache = false ) { if ( $this->sha1Base36 !== null && !$recache ) { - return $this->sha1Base36; } - wfSuppressWarnings(); + MediaWiki\suppressWarnings(); $this->sha1Base36 = sha1_file( $this->path ); - wfRestoreWarnings(); + MediaWiki\restoreWarnings(); if ( $this->sha1Base36 !== false ) { $this->sha1Base36 = wfBaseConvert( $this->sha1Base36, 16, 36, 31 ); |