diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2005-08-01 18:42:03 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2005-08-01 18:42:03 +0000 |
| commit | bd974e32890c11bad1e3b70f936d3026ef59edbf (patch) | |
| tree | 0dfbb789db4f0a832cdddc8fac72027bba4c6fca /confirm.php | |
| parent | b5bf27ddc4ddac64a14fa82c2262acb10b5335cf (diff) | |
| download | users-bd974e32890c11bad1e3b70f936d3026ef59edbf.tar.gz users-bd974e32890c11bad1e3b70f936d3026ef59edbf.tar.bz2 users-bd974e32890c11bad1e3b70f936d3026ef59edbf.zip | |
merge recent changes with HEAD - R1 and HEAD are identical now
Diffstat (limited to 'confirm.php')
| -rw-r--r-- | confirm.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/confirm.php b/confirm.php index 8c7afd8..278cea7 100644 --- a/confirm.php +++ b/confirm.php @@ -1,6 +1,6 @@ <?php /** - * $Header: /cvsroot/bitweaver/_bit_users/confirm.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * $Header: /cvsroot/bitweaver/_bit_users/confirm.php,v 1.3 2005/08/01 18:42:02 squareing Exp $ * * Copyright (c) 2004 bitweaver.org * Copyright (c) 2003 tikwiki.org @@ -8,7 +8,7 @@ * All Rights Reserved. See copyright.txt for details and a complete list of authors. * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details * - * $Id: confirm.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * $Id: confirm.php,v 1.3 2005/08/01 18:42:02 squareing Exp $ * @package users * @subpackage functions */ @@ -19,10 +19,10 @@ require_once( '../bit_setup_inc.php' ); if( $userInfo = $gBitUser->confirmRegistration( $_REQUEST["user"], $_REQUEST["pass"] ) ) { - $smarty->assign_by_ref( 'userInfo', $userInfo ); + $gBitSmarty->assign_by_ref( 'userInfo', $userInfo ); $gBitSystem->display( 'bitpackage:users/change_password.tpl' ); } else { - $smarty->assign('msg', tra("Invalid username or password")); + $gBitSmarty->assign('msg', tra("Invalid username or password")); $gBitSystem->display( 'error.tpl' ); } ?> |