Index: branches/5.1.x/core/kernel/utility/debugger.php
===================================================================
diff -u -N -r13168 -r13394
--- branches/5.1.x/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 13168)
+++ branches/5.1.x/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 13394)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: debugger.php 13168 2010-02-24 17:26:57Z alex $
+* @version	$Id: debugger.php 13394 2010-04-25 12:04:59Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -34,6 +34,13 @@
 			var $IsFatalError = false;
 
 			/**
+			 * Counts warnings on the page
+			 *
+			 * @var int
+			 */
+			var $WarningCount = 0;
+
+			/**
 			 * Allows to track compile errors, like "stack-overflow"
 			 *
 			 * @var bool
@@ -1212,7 +1219,7 @@
 						$Debugger.DebugURL = '<?php echo $this->baseURL.'/debugger_responce.php?sid='.$this->rowSeparator.'&path='.urlencode($dbg_path); ?>';
 						$Debugger.EventURL = '<?php echo is_object($application->Factory) ? $application->HREF('dummy', '', Array ('pass' => 'm')) : ''; ?>';
 						<?php
-							if ($this->IsFatalError || DBG_RAISE_ON_WARNINGS) {
+							if ($this->IsFatalError || (DBG_RAISE_ON_WARNINGS && $this->WarningCount)) {
 								echo '$Debugger.Toggle();';
 							}
 							if (DBG_TOOLBAR_BUTTONS) {
@@ -1352,6 +1359,11 @@
 				$this->Data[] = Array('no' => $errno, 'str' => $errstr, 'file' => $errfile, 'line' => $errline, 'context' => $errcontext, 'debug_type' => 'error');
 				$this->ProfilerData['error_handling']['ends'] = memory_get_usage();
 				$this->profilerAddTotal('error_handling', 'error_handling');
+
+				if ($errorType == 'Warning') {
+					$this->WarningCount++;
+				}
+
 				if (substr($errorType, 0, 5) == 'Fatal') {
 					$this->IsFatalError = true;
 					// append debugger report to data in buffer & clean buffer afterwards
Index: branches/5.1.x/core/kernel/application.php
===================================================================
diff -u -N -r13391 -r13394
--- branches/5.1.x/core/kernel/application.php	(.../application.php)	(revision 13391)
+++ branches/5.1.x/core/kernel/application.php	(.../application.php)	(revision 13394)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 13391 2010-04-24 20:17:29Z alex $
+* @version	$Id: application.php 13394 2010-04-25 12:04:59Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -2076,7 +2076,7 @@
 		$a_location = $location;
 		$location = "Location: $location";
 
-		if ($this->isDebugMode() && constOn('DBG_REDIRECT')) {
+		if ($this->isDebugMode() && (constOn('DBG_REDIRECT') || (constOn('DBG_RAISE_ON_WARNINGS') && $this->Application->Debugger->WarningCount))) {
 			$this->Debugger->appendTrace();
 			echo "<b>Debug output above!!!</b> Proceed to redirect: <a href=\"$a_location\">$a_location</a><br>";
 		}