From 3827fe3e7293c497f2131a56096206e69eddd206 Mon Sep 17 00:00:00 2001
From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Wed, 7 Sep 2011 12:54:57 +0000
Subject: [PATCH] Some comment and whitespace fixes

---
 includes/Article.php  |  3 +--
 includes/WikiPage.php | 16 ++++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/includes/Article.php b/includes/Article.php
index 3af63513c7..1d71bade26 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1993,7 +1993,6 @@ class Article extends Page {
 	 *
 	 * @param $fname String Field name
 	 * @param $fvalue mixed New value
-	 * @param $args Array Arguments to the method
 	 */
 	public function __set( $fname, $fvalue ) {
 		if ( property_exists( $this->mPage, $fname ) ) {
@@ -2003,7 +2002,7 @@ class Article extends Page {
 		} elseif ( !in_array( $fname, array( 'mContext', 'mPage' ) ) ) {
 			$this->mPage->$fname = $fvalue;
 		} else {
-			trigger_error( 'Inaccessible property via __get(): ' . $fname, E_USER_NOTICE );
+			trigger_error( 'Inaccessible property via __set(): ' . $fname, E_USER_NOTICE );
 		}
 	}
 
diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index 902d9ea102..0483eeb152 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -164,11 +164,11 @@ class WikiPage extends Page {
 		$dbw = wfGetDB( DB_MASTER );
 		$dbw->replace( 'redirect', array( 'rd_from' ),
 			array(
-				'rd_from' 		=> $this->getId(),
-				'rd_namespace' 	=> $rt->getNamespace(),
-				'rd_title' 		=> $rt->getDBkey(),
-				'rd_fragment' 	=> $rt->getFragment(),
-				'rd_interwiki' 	=> $rt->getInterwiki(),
+				'rd_from'      => $this->getId(),
+				'rd_namespace' => $rt->getNamespace(),
+				'rd_title'     => $rt->getDBkey(),
+				'rd_fragment'  => $rt->getFragment(),
+				'rd_interwiki' => $rt->getInterwiki(),
 			),
 			__METHOD__
 		);
@@ -799,7 +799,7 @@ class WikiPage extends Page {
 	 *
 	 * @param $dbw DatabaseBase: object
 	 * @param $revision Revision: For ID number, and text used to set
-						length and redirect status fields
+	 *                  length and redirect status fields
 	 * @param $lastRevision Integer: if given, will not overwrite the page field
 	 *                      when different from the currently set value.
 	 *                      Giving 0 indicates the new page flag should be set
@@ -1030,7 +1030,7 @@ class WikiPage extends Page {
 	 *          Fill in blank summaries with generated text where possible
 	 *
 	 * If neither EDIT_NEW nor EDIT_UPDATE is specified, the status of the article will be detected.
-	 * If EDIT_UPDATE is specified and the article doesn't exist, the function will an
+	 * If EDIT_UPDATE is specified and the article doesn't exist, the function will return an
 	 * edit-gone-missing error. If EDIT_NEW is specified and the article does exist, an
 	 * edit-already-exists error will be returned. These two conditions are also possible with
 	 * auto-detection due to MediaWiki's performance-optimised locking strategy.
@@ -1806,7 +1806,7 @@ class WikiPage extends Page {
 	 * and return value documentation
 	 *
 	 * NOTE: This function does NOT check ANY permissions, it just commits the
-	 * rollback to the DB Therefore, you should only call this function direct-
+	 * rollback to the DB. Therefore, you should only call this function direct-
 	 * ly if you want to use custom permissions checks. If you don't, use
 	 * doRollback() instead.
 	 * @param $fromP String: Name of the user whose edits to rollback.
-- 
2.20.1