From: Sam Reed <reedy@users.mediawiki.org>
Date: Sat, 25 Jun 2011 16:32:03 +0000 (+0000)
Subject: Followup r90722, seems the file comments were a bad merge...
X-Git-Tag: 1.31.0-rc.0~29283
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=f139c1862a73c5f7cdc49cb81c5ada4b73a65524;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/includes/filerepo/File.php b/includes/filerepo/File.php
index e1f89b8b04..d03016f7b5 100644
--- 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();