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 "Add filterFunction to visible{Byte,CodePoint}Limit"
[lhc/web/wiklou.git]
/
includes
/
utils
/
FileContentsHasher.php
diff --git
a/includes/utils/FileContentsHasher.php
b/includes/utils/FileContentsHasher.php
index
afe9c0a
..
e390f21
100644
(file)
--- a/
includes/utils/FileContentsHasher.php
+++ b/
includes/utils/FileContentsHasher.php
@@
-93,11
+93,11
@@
class FileContentsHasher {
$filePaths = (array)$filePaths;
}
$filePaths = (array)$filePaths;
}
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
if ( count( $filePaths ) === 1 ) {
$hash = $instance->getFileContentsHashInternal( $filePaths[0], $algo );
if ( count( $filePaths ) === 1 ) {
$hash = $instance->getFileContentsHashInternal( $filePaths[0], $algo );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
return $hash;
}
return $hash;
}
@@
-106,7
+106,7
@@
class FileContentsHasher {
return $instance->getFileContentsHashInternal( $filePath, $algo ) ?: '';
}, $filePaths );
return $instance->getFileContentsHashInternal( $filePath, $algo ) ?: '';
}, $filePaths );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
$hashes = implode( '', $hashes );
return $hashes ? hash( $algo, $hashes ) : false;
$hashes = implode( '', $hashes );
return $hashes ? hash( $algo, $hashes ) : false;