From 71724bb9faaa9323e8dcc9ada875f7eadd5809dd Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Thu, 24 Mar 2016 08:34:13 +0900
Subject: [PATCH] Always save debugging information even if DisplayHandler is
 not invoked

---
 classes/context/Context.class.php        |  6 ++++++
 classes/display/DisplayHandler.class.php | 23 +++++++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 1b0d2467c..6bca4401c 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -448,6 +448,12 @@ class Context
 	 */
 	public static function close()
 	{
+		// Save debugging information.
+		if (!DisplayHandler::$debug_printed)
+		{
+			DisplayHandler::getDebugInfo();
+		}
+		
 		// Check session status and close it if open.
 		if (self::checkSessionStatus())
 		{
diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php
index 8ed67bf13..ebbdbb3e4 100644
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@@ -12,6 +12,7 @@
 class DisplayHandler extends Handler
 {
 	public static $response_size = 0;
+	public static $debug_printed = 0;
 	var $content_size = 0; // /< The size of displaying contents
 	var $gz_enabled = FALSE; // / <a flog variable whether to call contents after compressing by gzip
 	var $handler = NULL;
@@ -136,16 +137,34 @@ class DisplayHandler extends Handler
 	 * 
 	 * @return string
 	 */
-	public function getDebugInfo(&$output)
+	public function getDebugInfo(&$output = null)
 	{
+		// Check if debugging information has already been printed.
+		
+		if (self::$debug_printed)
+		{
+			return;
+		}
+		else
+		{
+			self::$debug_printed = 1;
+		}
+		
 		// Check if debugging is enabled for this request.
 		if (!config('debug.enabled') || !Rhymix\Framework\Debug::isEnabledForCurrentUser())
 		{
 			return;
 		}
 		
+		// Do not display debugging information if there is no output.
+		$display_type = config('debug.display_type');
+		if ($output === null && $display_type !== 'file')
+		{
+			return;
+		}
+		
 		// Print debug information.
-		switch ($display_type = config('debug.display_type'))
+		switch ($display_type)
 		{
 			case 'panel':
 				$data = Rhymix\Framework\Debug::getDebugData();