Index: .
===================================================================
--- .	(revision 871)
+++ .	(working copy)
@@ -2,10 +2,10 @@
 //
 // Created on: <01-Aug-2002 09:58:09 bf>
 //
-// ## BEGIN COPYRIGHT, LICENSE AND WARRANTY NOTICE ##
 // SOFTWARE NAME: eZ publish
-// SOFTWARE RELEASE: 3.10.x
-// COPYRIGHT NOTICE: Copyright (C) 1999-2006 eZ systems AS
+// SOFTWARE RELEASE: 3.10.0
+// BUILD VERSION: 20254
+// COPYRIGHT NOTICE: Copyright (C) 1999-2007 eZ systems AS
 // SOFTWARE LICENSE: GNU General Public License v2.0
 // NOTICE: >
 //   This program is free software; you can redistribute it and/or
@@ -23,8 +23,6 @@
 //   MA 02110-1301, USA.
 //
 //
-// ## END COPYRIGHT, LICENSE AND WARRANTY NOTICE ##
-//
 
 include_once( "lib/ezutils/classes/ezhttptool.php" );
 include_once( "kernel/classes/datatypes/ezuser/ezuser.php" );
@@ -163,6 +161,7 @@
             // Check if user should be enabled and logged in
             unset($user);
             $user = eZUser::fetch( $object->attribute( 'id' ) );
+            $user->loginCurrent();
 
             $receiver = $user->attribute( 'email' );
             $mail = new eZMail();
@@ -192,6 +191,9 @@
                 $userSetting->setAttribute( 'is_enabled', 0 );
                 $userSetting->store();
 
+                // Log out current user
+                // eZUser::logoutCurrent();
+
                 // Create enable account hash and send it to the newly registered user
                 $hash = md5( mktime( ) . $user->attribute( 'contentobject_id' ) );
                 include_once( "kernel/classes/datatypes/ezuser/ezuseraccountkey.php" );
@@ -200,10 +202,6 @@
 
                 $tpl->setVariable( 'hash', $hash );
             }
-            else
-            {
-                $user->loginCurrent();
-            }
 
             $templateResult =& $tpl->fetch( 'design:user/registrationinfo.tpl' );
             $emailSender = $ini->variable( 'MailSettings', 'EmailSender' );
@@ -254,7 +252,14 @@
                 }
             }
 
-
+            // logout user here - otherwise the admin information template has no user infos
+            // and ez create a fatal error when $verifyUserEmail == "enabled"
+            // because the $user object is unset
+            if ( $verifyUserEmail == "enabled" )
+            {
+                // Log out current user
+                eZUser::logoutCurrent();
+            }
 
             $http->removeSessionVariable( "GeneratedPassword" );
             $http->removeSessionVariable( "RegisterUserID" );
@@ -295,4 +300,4 @@
                          array( 'url' => false,
                                 'text' => ezi18n( 'kernel/user', 'Register' ) ) );
 
-?>
+?>
\ No newline at end of file