Merge "Adding output parameter to PageHistoryBeforeList hook"

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

diff --git a/includes/filebackend/FSFile.php b/includes/filebackend/FSFile.php
index a6b6200..7d0dbd5 100644 (file)
--- a/includes/filebackend/FSFile.php
+++ b/includes/filebackend/FSFile.php
@@ -33,7 +33,7 @@ class FSFile {
        /**
         * Sets up the file object
         *
-        * @param $path string Path to temporary file on local disk
+        * @param string $path Path to temporary file on local disk
         * @throws MWException
         */
        public function __construct( $path ) {
@@ -201,6 +201,7 @@ class FSFile {
                wfProfileIn( __METHOD__ );
 
                if ( $this->sha1Base36 !== null && !$recache ) {
+                       wfProfileOut( __METHOD__ );
                        return $this->sha1Base36;
                }
 
@@ -230,7 +231,7 @@ class FSFile {
        /**
         * Get an associative array containing information about a file in the local filesystem.
         *
-        * @param $path String: absolute local filesystem path
+        * @param string $path absolute local filesystem path
         * @param $ext Mixed: the file extension, or true to extract it from the filename.
         *             Set it to false to ignore the extension.
         *