Index: trunk/core/units/general/inp_login_event_handler.php
===================================================================
diff -u -r1566 -r1649
--- trunk/core/units/general/inp_login_event_handler.php	(.../inp_login_event_handler.php)	(revision 1566)
+++ trunk/core/units/general/inp_login_event_handler.php	(.../inp_login_event_handler.php)	(revision 1649)
@@ -4,11 +4,9 @@
 	{
 		function OnSessionExpire()
 		{
-			if( defined('ADMIN') && ADMIN )
+			if( $this->Application->IsAdmin() )
 			{
-				$admin_dir = $this->Application->ConfigValue('AdminDirectory');
-				if(!$admin_dir) $admin_dir = 'admin';
-				$location = $this->Application->BaseURL().$admin_dir.'/index.php?expired=1';
+				$location = $this->Application->BaseURL().ADMIN_DIR.'/index.php?expired=1';
 				header('Location: '.$location);
 				exit;
 			}