Huge patchset (I don't recall all details):

[mailer.git] / inc / libs / user_functions.php

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index f2a659a14d0eea2ecd431929d2aeb81e1053d8ed..199ca7ee2158b4e935605b0366f408b06e094812 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -337,10 +337,11 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                        } // END - if
 
                        // Calculate new hash with the secret key and master salt together
-                       $content['hash'] = generatePassString($content['hash']);
+                       $content['hash'] = encodeHashForCookie($content['hash']);
 
-                       // Update global array
                        // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
+
+                       // Set member id
                        setMemberId($userid);
 
                        // Try to set session data (which shall normally always work!)