New functions introduced, several rewrites:

[mailer.git] / inc / modules / guest / what-login.php

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 4db7500c07cd27b989107f3137b7f0305b613297..0799b79fa3ee1a732d5f318d969d75aee2194561 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -73,7 +73,7 @@ if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
 } elseif (isPostRequestElementSet('new_pass')) {
        // New password requested
        $userid = '0';
-       if (isPostRequestElementSet('id')) $userid = bigintval(postRequestElement('id'));
+       if ((isPostRequestElementSet('id')) && (postRequestElement('id') > 0)) $userid = bigintval(postRequestElement('id'));
 } else {
        // Not logged in
        $userid = '0'; $hash = '';
@@ -110,6 +110,12 @@ if (!empty($errorCode)) {
   <td colspan=\"7\" align=\"center\">
     <span class=\"guest_failed\">";
 
+       // Do we have a userid set?
+       if (isSessionVariableSet('current_userid')) {
+               // Then prefetch data for this account
+               fetchUserData(getSession('current_userid'));
+       } // END - if
+
        // Convert the code to message
        $message .= getMessageFromErrorCode($errorCode);