From: Russ Nelson <nelson@users.mediawiki.org>
Date: Mon, 2 May 2011 18:48:35 +0000 (+0000)
Subject: Fix and add some comments.
X-Git-Tag: 1.31.0-rc.0~30449
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=e259adbb5006bbf92a39860b7d6609608f299e36;p=lhc%2Fweb%2Fwiklou.git

Fix and add some comments.
---

diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php
index 723c253e83..a24b5c3a77 100644
--- a/includes/filerepo/LocalFile.php
+++ b/includes/filerepo/LocalFile.php
@@ -33,7 +33,7 @@ class LocalFile extends File {
 	 * @private
 	 */
 	var
-		$fileExists,       # does the file file exist on disk? (loadFromXxx)
+		$fileExists,       # does the file exist on disk? (loadFromXxx)
 		$historyLine,      # Number of line to return by nextHistoryLine() (constructor)
 		$historyRes,       # result of the query for the file's history (nextHistoryLine)
 		$width,            # \
@@ -549,8 +549,8 @@ class LocalFile extends File {
 	/** isTrustedFile inherited */
 
 	/**
-	 * Returns true if the file file exists on disk.
-	 * @return boolean Whether file file exist on disk.
+	 * Returns true if the file exists on disk.
+	 * @return boolean Whether file exist on disk.
 	 */
 	public function exists() {
 		$this->load();
diff --git a/includes/filerepo/OldLocalFile.php b/includes/filerepo/OldLocalFile.php
index 544d3de3b9..d921a6b400 100644
--- a/includes/filerepo/OldLocalFile.php
+++ b/includes/filerepo/OldLocalFile.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Old file in the in the oldimage table
+ * Old file in the oldimage table
  *
  * @file
  * @ingroup FileRepo
diff --git a/thumb.php b/thumb.php
index 1a1dee4618..30b61592b4 100644
--- a/thumb.php
+++ b/thumb.php
@@ -41,7 +41,7 @@ function wfThumbMain() {
 	if ( isset( $params['p'] ) ) {
 		$params['page'] = $params['p'];
 	}
-	unset( $params['r'] );
+	unset( $params['r'] ); // ignore 'r' because we unconditionally pass File::RENDER
 
 	// Is this a thumb of an archived file?
 	$isOld = (isset( $params['archived'] ) && $params['archived']);