Index: trunk/core/kernel/application.php
===================================================================
diff -u -r1821 -r1837
--- trunk/core/kernel/application.php	(.../application.php)	(revision 1821)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 1837)
@@ -857,13 +857,22 @@
 		$location = "Location: $location";
 		//echo " location : $location <br>";
 		
-		if (headers_sent() != '' || ($this->isDebugMode() && dbg_ConstOn('DBG_REDIRECT')) ) {
-			/*$GLOBALS['debugger']->appendTrace();
-			echo "<b>Debug output above!!!</b> Proceed to redirect: <a href=\"$a_location\">$a_location</a><br>";*/
-			echo '<script language="javascript" type="text/javascript">window.location.href = \''.$a_location.'\';</script>';
+		
+		if( $this->isDebugMode() && dbg_ConstOn('DBG_REDIRECT') )
+		{
+			$GLOBALS['debugger']->appendTrace();
+			echo "<b>Debug output above!!!</b> Proceed to redirect: <a href=\"$a_location\">$a_location</a><br>";
 		}
-		else {
-			header("$location");
+		else
+		{
+			if(headers_sent() != '')
+			{
+				echo '<script language="javascript" type="text/javascript">window.location.href = \''.$a_location.'\';</script>';
+			}
+			else
+			{
+				header("$location");
+			}
 		}
 		
 		$session =& $this->recallObject('Session');