Index: t3lib/class.t3lib_div.php
===================================================================
--- t3lib/class.t3lib_div.php	(revision 3632)
+++ t3lib/class.t3lib_div.php	(working copy)
@@ -3086,7 +3086,7 @@
 	 * @internal
 	 * @see view_array()
 	 */
-	public static function print_array($array_in)	{
+	public static function print_array($array_in, $doEcho = true)	{
 		echo t3lib_div::view_array($array_in);
 	}
 
@@ -3097,6 +3097,11 @@
 	 * If $var is an array, the array is printed by t3lib_div::print_array()
 	 * Usage: 8
 	 *
+	 * Debug output is collected in $GLOBALS['debugOut']
+	 * it will printed direct if $GLOBALS['forceDebug'] is set
+	 * it can be supressed with setting $GLOBALS['noDebug']
+	 * 
+	 * 
 	 * @param	mixed		Variable to print
 	 * @param	mixed		If the parameter is a string it will be used as header. Otherwise number of break tags to apply after (positive integer) or before (negative integer) the output.
 	 * @return	void
@@ -3106,30 +3111,36 @@
 		if (ob_get_level()==0) {
 			ob_start();
 		}
-
+		
 		if ($brOrHeader && !t3lib_div::testInt($brOrHeader))	{
-			echo '<table class="typo3-debug" border="0" cellpadding="0" cellspacing="0" bgcolor="white" style="border:0px; margin-top:3px; margin-bottom:3px;"><tr><td style="background-color:#bbbbbb; font-family: verdana,arial; font-weight: bold; font-size: 10px;">'.htmlspecialchars((string)$brOrHeader).'</td></tr><tr><td>';
+			$GLOBALS['debugOut'] .= '<table class="typo3-debug" border="0" cellpadding="0" cellspacing="0" bgcolor="white" style="border:0px; margin-top:3px; margin-bottom:3px;"><tr><td style="background-color:#bbbbbb; font-family: verdana,arial; font-weight: bold; font-size: 10px;">'.htmlspecialchars((string)$brOrHeader).'</td></tr><tr><td>';
 		} elseif ($brOrHeader<0)	{
-			for($a=0;$a<abs(intval($brOrHeader));$a++){echo '<br />';}
+			for($a=0;$a<abs(intval($brOrHeader));$a++){$GLOBALS['debugOut'] .= '<br />';}
 		}
 
 		if (is_array($var))	{
-			t3lib_div::print_array($var);
+			$GLOBALS['debugOut'] .= t3lib_div::view_array($var);
 		} elseif (is_object($var))	{
-			echo '<b>|Object:<pre>';
-			print_r($var);
-			echo '</pre>|</b>';
+			$GLOBALS['debugOut'] .= '<b>|Object:<pre>';
+			$GLOBALS['debugOut'] .= print_r($var,true);
+			$GLOBALS['debugOut'] .= '</pre>|</b>';
 		} elseif ((string)$var!='')	{
-			echo '<b>|'.htmlspecialchars((string)$var).'|</b>';
+			$GLOBALS['debugOut'] .= '<b>|'.htmlspecialchars((string)$var).'|</b>';
 		} else {
-			echo '<b>| debug |</b>';
+			$GLOBALS['debugOut'] .= '<b>| debug |</b>';
 		}
 
 		if ($brOrHeader && !t3lib_div::testInt($brOrHeader))	{
-			echo '</td></tr></table>';
+			$GLOBALS['debugOut'] .= '</td></tr></table>';
 		} elseif ($brOrHeader>0)	{
-			for($a=0;$a<intval($brOrHeader);$a++){echo '<br />';}
+			for($a=0;$a<intval($brOrHeader);$a++){$GLOBALS['debugOut'] .= '<br />';}
 		}
+		
+			// print if forced
+		if ($GLOBALS['forceDebug']) {
+			echo $GLOBALS['debugOut'];
+			$GLOBALS['debugOut'] = '';
+		}
 	}
 
 	/**
@@ -5138,4 +5149,4 @@
 	}
 }
 
-?>
\ No newline at end of file
+?>
Index: typo3/sysext/cms/tslib/index_ts.php
===================================================================
--- typo3/sysext/cms/tslib/index_ts.php	(revision 3632)
+++ typo3/sysext/cms/tslib/index_ts.php	(working copy)
@@ -598,6 +598,10 @@
 if(@is_callable(array($error,'debugOutput'))) {
 	$error->debugOutput();
 }
+if ($GLOBALS['debugOut'] && !$GLOBALS['noDebug']) {
+		echo '<div id="debugOut">' . $GLOBALS['debugOut'] . '</div>';
+}
+		
 if (TYPO3_DLOG)	t3lib_div::devLog('END of FRONTEND session','',0,array('_FLUSH'=>TRUE));
 
 
Index: typo3/template.php
===================================================================
--- typo3/template.php	(revision 3632)
+++ typo3/template.php	(working copy)
@@ -608,6 +608,11 @@
 	 * @see endPage()
 	 */
 	function startPage($title)	{
+		
+		if (ob_get_level()==0) {
+			ob_start();
+		}
+		
 			// hook	pre start page
 		if (isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/template.php']['preStartPageHook']))	{
 			$preStartPageHook =& $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/template.php']['preStartPageHook'];
@@ -1857,8 +1862,9 @@
 	 * @return	string		Composite HTML
 	 */
 	public function moduleBody($pageRecord = array(), $buttons = array(), $markerArray = array(), $subpartArray = array()) {
+				
 			// Get the HTML template for the module
-		$moduleBody = t3lib_parsehtml::getSubpart($this->moduleTemplate, '###FULLDOC###');
+		$moduleBody = $buffer . t3lib_parsehtml::getSubpart($this->moduleTemplate, '###FULLDOC###');
 			// Add CSS
 		$this->inDocStylesArray[] = 'html { overflow: hidden; }';
 			// Add JS code to the <head> for IE
@@ -1875,7 +1881,9 @@
 				}
 			}
 		');
-			// Get the page path for the docheader
+		    // Get debug
+        $markerArray['DEBUG'] = !$GLOBALS['noDebug'] ? $GLOBALS['debugOut'] : '';
+        	// Get the page path for the docheader
 		$markerArray['PAGEPATH'] = $this->getPagePath($pageRecord);
 			// Get the page info for the docheader
 		$markerArray['PAGEINFO'] = $this->getPageInfo($pageRecord);
Index: typo3/templates/alt_db_navframe.html
===================================================================
--- typo3/templates/alt_db_navframe.html	(revision 3632)
+++ typo3/templates/alt_db_navframe.html	(working copy)
@@ -22,6 +22,7 @@
 		<div id="typo3-inner-docbody">
 			###WORKSPACEINFO###
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/alt_doc.html
===================================================================
--- typo3/templates/alt_doc.html	(revision 3632)
+++ typo3/templates/alt_doc.html	(working copy)
@@ -16,6 +16,7 @@
 		<div id="typo3-inner-docbody">
 			###EXTRAHEADER###
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/belog.html
===================================================================
--- typo3/templates/belog.html	(revision 3632)
+++ typo3/templates/belog.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/beuser.html
===================================================================
--- typo3/templates/beuser.html	(revision 3632)
+++ typo3/templates/beuser.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/config.html
===================================================================
--- typo3/templates/config.html	(revision 3632)
+++ typo3/templates/config.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/db_layout.html
===================================================================
--- typo3/templates/db_layout.html	(revision 3632)
+++ typo3/templates/db_layout.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/db_layout_quickedit.html
===================================================================
--- typo3/templates/db_layout_quickedit.html	(revision 3632)
+++ typo3/templates/db_layout_quickedit.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/db_list.html
===================================================================
--- typo3/templates/db_list.html	(revision 3632)
+++ typo3/templates/db_list.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/db_new.html
===================================================================
--- typo3/templates/db_new.html	(revision 3632)
+++ typo3/templates/db_new.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/db_new_content_el.html
===================================================================
--- typo3/templates/db_new_content_el.html	(revision 3632)
+++ typo3/templates/db_new_content_el.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/dbint.html
===================================================================
--- typo3/templates/dbint.html	(revision 3632)
+++ typo3/templates/dbint.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/em_index.html
===================================================================
--- typo3/templates/em_index.html	(revision 3632)
+++ typo3/templates/em_index.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/file_edit.html
===================================================================
--- typo3/templates/file_edit.html	(revision 3632)
+++ typo3/templates/file_edit.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/file_list.html
===================================================================
--- typo3/templates/file_list.html	(revision 3632)
+++ typo3/templates/file_list.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/file_newfolder.html
===================================================================
--- typo3/templates/file_newfolder.html	(revision 3632)
+++ typo3/templates/file_newfolder.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/file_rename.html
===================================================================
--- typo3/templates/file_rename.html	(revision 3632)
+++ typo3/templates/file_rename.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/file_upload.html
===================================================================
--- typo3/templates/file_upload.html	(revision 3632)
+++ typo3/templates/file_upload.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/func.html
===================================================================
--- typo3/templates/func.html	(revision 3632)
+++ typo3/templates/func.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/info.html
===================================================================
--- typo3/templates/info.html	(revision 3632)
+++ typo3/templates/info.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/move_el.html
===================================================================
--- typo3/templates/move_el.html	(revision 3632)
+++ typo3/templates/move_el.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/perm.html
===================================================================
--- typo3/templates/perm.html	(revision 3632)
+++ typo3/templates/perm.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/setup.html
===================================================================
--- typo3/templates/setup.html	(revision 3632)
+++ typo3/templates/setup.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/show_rechis.html
===================================================================
--- typo3/templates/show_rechis.html	(revision 3632)
+++ typo3/templates/show_rechis.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/tsconfig_help.html
===================================================================
--- typo3/templates/tsconfig_help.html	(revision 3632)
+++ typo3/templates/tsconfig_help.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/tstemplate.html
===================================================================
--- typo3/templates/tstemplate.html	(revision 3632)
+++ typo3/templates/tstemplate.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/version.html
===================================================================
--- typo3/templates/version.html	(revision 3632)
+++ typo3/templates/version.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/ws.html
===================================================================
--- typo3/templates/ws.html	(revision 3632)
+++ typo3/templates/ws.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>
Index: typo3/templates/ws_forms.html
===================================================================
--- typo3/templates/ws_forms.html	(revision 3632)
+++ typo3/templates/ws_forms.html	(working copy)
@@ -15,6 +15,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 			###CONTENT###
+			###DEBUG###
 		</div>
 	</div>
 </div>