From a509bf41bed7a6a79e8ce08a1e68c3c3a8d27fce Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Wed, 7 Sep 2011 21:14:55 +0000
Subject: [PATCH] Fix whitespace

Swap xor for ^

Documentation
---
 RELEASE-NOTES-1.19                     |  2 +-
 includes/api/ApiMain.php               |  2 +-
 includes/logging/LogFormatter.php      |  4 +++-
 includes/specials/SpecialUserlogin.php |  3 +--
 maintenance/namespaceDupes.php         | 10 ++++++++++
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 1e7528d32f..1d1c5a5e3e 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -76,7 +76,7 @@ production.
   warnings/notices to be thrown.
 * (bug 30335) Fix for HTMLForms using GET breaking when non-friendly URLs are
   used
-* (bug 28649) Avoiding half truncated multi-byte unicode characters when 
+* (bug 28649) Avoiding half truncated multi-byte unicode characters when
   truncating log comments.
 * Show --batch-size option in help of maintenance scripts that support it
 * (bug 4381) Magic quotes cleaning was not comprehensive, key strings were not
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index e45ba85cf1..a88a0a5399 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -428,7 +428,7 @@ class ApiMain extends ApiBase {
 				return;
 			} // else no XVO and anonymous, send public headers below
 		}
-		
+
 		// Send public headers
 		if ( $wgVaryOnXFPForAPI ) {
 			$response->header( 'Vary: Accept-Encoding, X-Forwarded-Proto' );
diff --git a/includes/logging/LogFormatter.php b/includes/logging/LogFormatter.php
index e9b01eff3f..a036248040 100644
--- a/includes/logging/LogFormatter.php
+++ b/includes/logging/LogFormatter.php
@@ -56,7 +56,9 @@ class LogFormatter {
 
 	// Nonstatic->
 
-	/// @var LogEntry
+	/**
+	 * @var LogEntry
+	 */
 	protected $entry;
 
 	/// Whether to output user tool links
diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index 5527086d0a..73bdd3c698 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -377,7 +377,7 @@ class LoginForm extends SpecialPage {
 			return false;
 		}
 
-		// Hook point to check for exempt from account creation throttle	
+		// Hook point to check for exempt from account creation throttle
 		if ( !wfRunHooks( 'exemptFromAccountCreationThrottle', array( $ip ) ) ) {
 			wfDebug( "LoginForm::exemptFromAccountCreationThrottle: a hook allowed account creation w/o throttle\n" );
 		} else {
@@ -780,7 +780,6 @@ class LoginForm extends SpecialPage {
 	 * @param $emailTitle String: message name of email title
 	 * @param $emailText String: message name of email text
 	 * @return Status object
-	 * @private
 	 */
 	function mailPasswordInternal( $u, $throttle = true, $emailTitle = 'passwordremindertitle', $emailText = 'passwordremindertext' ) {
 		global $wgServer, $wgScript, $wgUser, $wgNewPasswordExpiry, $wgRequest;
diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index b883ea6857..08783d7e32 100644
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -26,6 +26,12 @@
 require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class NamespaceConflictChecker extends Maintenance {
+
+	/**
+	 * @var DatabaseBase
+	 */
+	protected $db;
+
 	public function __construct() {
 		parent::__construct();
 		$this->mDescription = "";
@@ -183,6 +189,8 @@ class NamespaceConflictChecker extends Maintenance {
 	 *
 	 * @param $ns Integer: namespace id (id for new namespace?)
 	 * @param $name String: prefix that is being made a namespace
+	 *
+	 * @return array
 	 */
 	private function getConflicts( $ns, $name ) {
 		$page  = 'page';
@@ -217,6 +225,8 @@ class NamespaceConflictChecker extends Maintenance {
 
 	/**
 	 * Report any conflicts we find
+	 *
+	 * @return bool
 	 */
 	private function reportConflict( $row, $suffix ) {
 		$newTitle = Title::makeTitleSafe( $row->namespace, $row->title );
-- 
2.20.1