Merge "Allow maintenance/cdb.php to look up keys with spaces in them."

[lhc/web/wiklou.git] / includes / filebackend / FileOp.php

diff --git a/includes/filebackend/FileOp.php b/includes/filebackend/FileOp.php
index 4e03675..5d4e8e1 100644 (file)
--- a/includes/filebackend/FileOp.php
+++ b/includes/filebackend/FileOp.php
@@ -178,7 +178,7 @@ abstract class FileOp {
         * Check if this operation changes files listed in $paths
         *
         * @param array $deps Prior path reads/writes; format of FileOp::newPredicates()
-        * @return boolean
+        * @return bool
         */
        final public function dependsOn( array $deps ) {
                foreach ( $this->storagePathsChanged() as $path ) {
@@ -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 );
                }