Index: trunk/kernel/action.php
===================================================================
diff -u -N -r2772 -r2853
--- trunk/kernel/action.php	(.../action.php)	(revision 2772)
+++ trunk/kernel/action.php	(.../action.php)	(revision 2853)
@@ -25,15 +25,7 @@
 
 // Session expiration related
 
-if (!admin_login() && strlen($Action) > 0)
-{            
-    if(!headers_sent())
-      setcookie("sid"," ",time()-3600, '', $_SERVER['HTTP_HOST']);
-    $objSession->Logout();
-    header("Location: ".$adminURL.'/index.php?env='.BuildEnv().'&expired=1');
-    die();
-	//require_once($pathtoroot."admin/login.php");
-}
+require_login( !admin_login() && $Action, 'expired=1', true );
 
 // End session exipration related