In-Portal Issue Tracker

Index: core/units/users/users_tag_processor.php
===================================================================
--- core/units/users/users_tag_processor.php	(revision 12350)
+++ core/units/users/users_tag_processor.php	(working copy)
@@ -96,14 +96,19 @@
 
 		function TestCodeIsValid($params)
 		{
-		   	$passed_key = trim($this->Application->GetVar('user_key'));
+			$errors = Array (
+				'invalid' => array_key_exists('error_invalid', $params) ? $params['error_invalid'] : 'lu_code_is_not_valid',
+				'expired' => array_key_exists('error_expired', $params) ? $params['error_expired'] : 'lu_code_expired',
+			);
 
+			$passed_key = trim($this->Application->GetVar('user_key'));
+
 	     	// used for error reporting only -> rewrite code + theme (by Alex)
 	     	$user_current_object = &$this->Application->recallObject('u', null, Array('skip_autoload' => true)); // TODO: change theme too
 			/* @var $user_current_object UsersItem */
 
 		    if (!$passed_key) {
-		    	$user_current_object->SetError('PwResetConfirm', 'code_is_not_valid', 'lu_code_is_not_valid');
+		    	$user_current_object->SetError('PwResetConfirm', 'code_is_not_valid', $errors['invalid']);
 				return false;
 		    }
 
@@ -117,12 +122,12 @@
 		      	if ($expiration_time > adodb_mktime()) {
 					return true;
 		      	} else {
-		      		$user_current_object->SetError('PwResetConfirm', 'code_expired', 'lu_code_expired');
+		      		$user_current_object->SetError('PwResetConfirm', 'code_expired', $errors['expired']);
 		      		return false;
 		      	}
 		    }
 		    else {
-		    	$user_current_object->SetError('PwResetConfirm', 'code_is_not_valid', 'lu_code_is_not_valid');
+		    	$user_current_object->SetError('PwResetConfirm', 'code_is_not_valid', $errors['invalid']);
 		    	return false;
 		    }