dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Simplify by using ?: operator"
[lhc/web/wiklou.git]
/
includes
/
libs
/
filebackend
/
fsfile
/
FSFile.php
diff --git
a/includes/libs/filebackend/fsfile/FSFile.php
b/includes/libs/filebackend/fsfile/FSFile.php
index
dacad1c
..
553c9aa
100644
(file)
--- a/
includes/libs/filebackend/fsfile/FSFile.php
+++ b/
includes/libs/filebackend/fsfile/FSFile.php
@@
-75,9
+75,9
@@
class FSFile {
* @return string|bool TS_MW timestamp or false on failure
*/
public function getTimestamp() {
* @return string|bool TS_MW timestamp or false on failure
*/
public function getTimestamp() {
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
$timestamp = filemtime( $this->path );
$timestamp = filemtime( $this->path );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
if ( $timestamp !== false ) {
$timestamp = wfTimestamp( TS_MW, $timestamp );
}
if ( $timestamp !== false ) {
$timestamp = wfTimestamp( TS_MW, $timestamp );
}
@@
-168,9
+168,9
@@
class FSFile {
return $this->sha1Base36;
}
return $this->sha1Base36;
}
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
$this->sha1Base36 = sha1_file( $this->path );
$this->sha1Base36 = sha1_file( $this->path );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
if ( $this->sha1Base36 !== false ) {
$this->sha1Base36 = Wikimedia\base_convert( $this->sha1Base36, 16, 36, 31 );
if ( $this->sha1Base36 !== false ) {
$this->sha1Base36 = Wikimedia\base_convert( $this->sha1Base36, 16, 36, 31 );