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 "objectcache: add BagOStuff::fieldHasFlags() convenience method"
[lhc/web/wiklou.git]
/
includes
/
libs
/
filebackend
/
FileBackendStore.php
diff --git
a/includes/libs/filebackend/FileBackendStore.php
b/includes/libs/filebackend/FileBackendStore.php
index
e2a25fc
..
aa95ee4
100644
(file)
--- a/
includes/libs/filebackend/FileBackendStore.php
+++ b/
includes/libs/filebackend/FileBackendStore.php
@@
-20,6
+20,7
@@
* @file
* @ingroup FileBackend
*/
* @file
* @ingroup FileBackend
*/
+use Wikimedia\AtEase\AtEase;
use Wikimedia\Timestamp\ConvertibleTimestamp;
/**
use Wikimedia\Timestamp\ConvertibleTimestamp;
/**
@@
-376,9
+377,9
@@
abstract class FileBackendStore extends FileBackend {
unset( $params['latest'] ); // sanity
// Check that the specified temp file is valid...
unset( $params['latest'] ); // sanity
// Check that the specified temp file is valid...
-
Wikimedia\
suppressWarnings();
+
AtEase::
suppressWarnings();
$ok = ( is_file( $tmpPath ) && filesize( $tmpPath ) == 0 );
$ok = ( is_file( $tmpPath ) && filesize( $tmpPath ) == 0 );
-
Wikimedia\
restoreWarnings();
+
AtEase::
restoreWarnings();
if ( !$ok ) { // not present or not empty
$status->fatal( 'backend-fail-opentemp', $tmpPath );
if ( !$ok ) { // not present or not empty
$status->fatal( 'backend-fail-opentemp', $tmpPath );
@@
-714,9
+715,9
@@
abstract class FileBackendStore extends FileBackend {
protected function doGetFileContentsMulti( array $params ) {
$contents = [];
foreach ( $this->doGetLocalReferenceMulti( $params ) as $path => $fsFile ) {
protected function doGetFileContentsMulti( array $params ) {
$contents = [];
foreach ( $this->doGetLocalReferenceMulti( $params ) as $path => $fsFile ) {
-
Wikimedia\
suppressWarnings();
+
AtEase::
suppressWarnings();
$contents[$path] = $fsFile ? file_get_contents( $fsFile->getPath() ) : false;
$contents[$path] = $fsFile ? file_get_contents( $fsFile->getPath() ) : false;
-
Wikimedia\
restoreWarnings();
+
AtEase::
restoreWarnings();
}
return $contents;
}
return $contents;