Index: branches/5.1.x/core/units/users/users_tag_processor.php
===================================================================
diff -u -r12657 -r13086
--- branches/5.1.x/core/units/users/users_tag_processor.php	(.../users_tag_processor.php)	(revision 12657)
+++ branches/5.1.x/core/units/users/users_tag_processor.php	(.../users_tag_processor.php)	(revision 13086)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_tag_processor.php 12657 2009-10-04 20:07:31Z alex $
+* @version	$Id: users_tag_processor.php 13086 2010-01-12 19:47:40Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -9,7 +9,7 @@
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
+* See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
@@ -118,6 +118,13 @@
 				),
 			);
 
+			if ($code_type == 'custom') {
+				// custom error messages are given directly in tag
+				$error_messages['custom'] = Array (
+					'code_is_not_valid' => $params['error_invalid'],
+					'code_expired' => $params['error_expired'],
+				);
+			}
 
 		    if (!$passed_key) {
 		    	$user_current_object->SetError('PwResetConfirm', 'code_is_not_valid', $error_messages[$code_type]['code_is_not_valid']);