Make sure user password code and update script agree.

diff --git a/includes/User.php b/includes/User.php
index f08ab8b..4b81b35 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -277,7 +277,7 @@ class User {
 
        function addSalt( $p )
        {
 
        function addSalt( $p )
        {

-               return md5( "wikipedia{$this->mId}-{$p}" );
+               return md5( "{$this->mId}-{$p}" );

        }
 
        function encryptPassword( $p )
        }
 
        function encryptPassword( $p )

diff --git a/update.php b/update.php
index 9aaace1..e93fb1e 100644 (file)
--- 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;
        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}";
 
                $sql = "UPDATE user SET user_password='{$newpass}' " .
                  "WHERE user_id={$id}";