From f63f4e6e974551d9cb977983a3f8c5d8e0352617 Mon Sep 17 00:00:00 2001
From: Lee Daniel Crocker <lcrocker@users.mediawiki.org>
Date: Mon, 28 Apr 2003 17:19:51 +0000
Subject: [PATCH] Fix problem with new password salt code.

---
 includes/User.php      | 8 ++++----
 languages/Language.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/includes/User.php b/includes/User.php
index 45c60a2cc2..bfc369a5c5 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -163,7 +163,7 @@ class User {
 			$passwordCorrect = $wsUserPassword == $this->mPassword;
 		} else if ( isset( $HTTP_COOKIE_VARS["wcUserPassword"] ) ) {
 			$this->mCookiePassword = $HTTP_COOKIE_VARS["wcUserPassword"];
-			$wsUserPassword = $this->addSalt($this->mCookiePassword);
+			$wsUserPassword = User::addSalt($this->mCookiePassword);
 			$passwordCorrect = $wsUserPassword == $this->mPassword;
 		} else {
 			$this->mId = 0;
@@ -284,14 +284,14 @@ class User {
 
 	function encryptPassword( $p )
 	{
-		return $this->addSalt( md5( $p ) );
+		return User::addSalt( md5( $p ) );
 	}
 
 	function setPassword( $str )
 	{
 		$this->loadFromDatabase();
 		$this->setCookiePassword( $str );
-		$this->mPassword = $this->encryptPassword( $str );
+		$this->mPassword = User::encryptPassword( $str );
 		$this->mNewpassword = "";
 	}
 
@@ -304,7 +304,7 @@ class User {
 	function setNewpassword( $str )
 	{
 		$this->loadFromDatabase();
-		$this->mNewpassword = $this->encryptPassword( $str );
+		$this->mNewpassword = User::encryptPassword( $str );
 	}
 
 	function getEmail()
diff --git a/languages/Language.php b/languages/Language.php
index 6a99ed7516..b147d4e47b 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1309,6 +1309,6 @@ class Language {
 }
 
 global $IP;
-@include_once( "$IP/Language" . ucfirst( $wgLanguageCode ) . ".php" );
+@include_once( "{$IP}/Language" . ucfirst( $wgLanguageCode ) . ".php" );
 
 ?>
-- 
2.20.1