Fix problem with new password salt code.

diff --git a/includes/User.php b/includes/User.php
index 45c60a2..bfc369a 100644 (file)
--- 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 6a99ed7..b147d4e 100644 (file)
--- 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" );
 
 ?>