Merge "Simplify HTMLTitleTextField::validate"

[lhc/web/wiklou.git] / includes / libs / filebackend / fsfile / TempFSFile.php

diff --git a/includes/libs/filebackend/fsfile/TempFSFile.php b/includes/libs/filebackend/fsfile/TempFSFile.php
index fed6812..321424f 100644 (file)
--- a/includes/libs/filebackend/fsfile/TempFSFile.php
+++ b/includes/libs/filebackend/fsfile/TempFSFile.php
@@ -61,10 +61,10 @@ class TempFSFile extends FSFile {
                        if ( !is_string( $tmpDirectory ) ) {
                                $tmpDirectory = self::getUsableTempDirectory();
                        }
-                       $path = wfTempDir() . '/' . $prefix . $hex . $ext;
-                       MediaWiki\suppressWarnings();
+                       $path = $tmpDirectory . '/' . $prefix . $hex . $ext;
+                       Wikimedia\suppressWarnings();
                        $newFileHandle = fopen( $path, 'x' );
-                       MediaWiki\restoreWarnings();
+                       Wikimedia\restoreWarnings();
                        if ( $newFileHandle ) {
                                fclose( $newFileHandle );
                                $tmpFile = new self( $path );
@@ -119,9 +119,9 @@ class TempFSFile extends FSFile {
         */
        public function purge() {
                $this->canDelete = false; // done
-               MediaWiki\suppressWarnings();
+               Wikimedia\suppressWarnings();
                $ok = unlink( $this->path );
-               MediaWiki\restoreWarnings();
+               Wikimedia\restoreWarnings();
 
                unset( self::$pathsCollect[$this->path] );
 
@@ -179,9 +179,9 @@ class TempFSFile extends FSFile {
         */
        public static function purgeAllOnShutdown() {
                foreach ( self::$pathsCollect as $path ) {
-                       MediaWiki\suppressWarnings();
+                       Wikimedia\suppressWarnings();
                        unlink( $path );
-                       MediaWiki\restoreWarnings();
+                       Wikimedia\restoreWarnings();
                }
        }