From a34ce8d0407c2947046c73d6b3cc5ebe026744f4 Mon Sep 17 00:00:00 2001
From: Lee Daniel Crocker <lcrocker@users.mediawiki.org>
Date: Wed, 7 May 2003 00:23:18 +0000
Subject: [PATCH] Make sure user password code and update script agree.

---
 includes/User.php | 2 +-
 update.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/User.php b/includes/User.php
index f08ab8b489..4b81b35eb0 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -277,7 +277,7 @@ class User {
 
 	function addSalt( $p )
 	{
-		return md5( "wikipedia{$this->mId}-{$p}" );
+		return md5( "{$this->mId}-{$p}" );
 	}
 
 	function encryptPassword( $p )
diff --git a/update.php b/update.php
index 9aaace1698..e93fb1e771 100644
--- a/update.php
+++ b/update.php
@@ -124,7 +124,7 @@ function update_passwords() {
 	while ( $row = mysql_fetch_object( $source ) ) {
 		$id = $row->user_id;
 		$oldpass = $row->user_password;
-		$newpass = md5( $oldpass . $id );
+		$newpass = md5( "{$id}-{$oldpass}" );
 
 		$sql = "UPDATE user SET user_password='{$newpass}' " .
 		  "WHERE user_id={$id}";
-- 
2.20.1