Followup r90722, seems the file comments were a bad merge...

diff --git a/includes/filerepo/File.php b/includes/filerepo/File.php
index e1f89b8..d03016f 100644 (file)
--- a/includes/filerepo/File.php
+++ b/includes/filerepo/File.php
@@ -1433,11 +1433,7 @@ abstract class File {
         *
         * @param $path string
         *
-        * @return false on failure
-        *
-        * @param $path string
-        *
-        * @return false|string
+        * @return false|string False on failure
         */
        static function sha1Base36( $path ) {
                wfSuppressWarnings();