Index: trunk/kernel/parser.php
===================================================================
diff -u -r1025 -r1035
--- trunk/kernel/parser.php	(.../parser.php)	(revision 1025)
+++ trunk/kernel/parser.php	(.../parser.php)	(revision 1035)
@@ -2243,7 +2243,7 @@
 
 function m_confirm_password_link($attribs = array())
 {
-	global $m_var_list_update, $objSession, $objConfig;
+	global $m_var_list_update, $var_list_update, $objSession, $objConfig;
 	
     $template = "forgotpw_reset_result";    
 //  $user = $objSession->Get("tmp_user_id").";".$objSession->Get("tmp_email");    
@@ -2257,8 +2257,8 @@
     
     $conn->Execute($sql);
     
-    $m_var_list_update["t"] = $template;	
-    
+    $var_list_update["t"] = $template;	
+
     $ret = ($attribs["_secure"]?"https://":"http://").ThisDomain().$objConfig->Get("Site_Path")."index.php?env=".BuildEnv().$query;
     
     return $ret;
@@ -2273,24 +2273,8 @@
  */
 function m_codevalidationresult($attribs=Array())
 {
- 	$passed_key = $_GET['user_key']; 	
- 	$conn = &GetADODBConnection();
- 	$sql = 'SELECT PwRequestTime FROM '.GetTablePrefix().'PortalUser WHERE PwResetConfirm="'.$passed_key.'"';
- 	$rs = $conn->Execute($sql);
- 	$PwRequestTime = $rs->Fields['PwRequestTime'];
- 	    
-    if (!$rs->EOF) 
-    {
-    	if ($PwRequestTime + 3600 < mktime())
-    	{
-    		return m_language(Array('_phrase'=>'lu_code_expired'));
-    	}
-    	return m_language(Array('_phrase'=>'lu_forgotpw_confirm_text'));
-    } 
-    else 
-    {
-    	return m_language(Array('_phrase'=>'lu_code_is_not_valid'));
-    }
+ 	global $m_var_list_update;
+	return $m_var_list_update['codevalidationresult'];
 }
 
 /*