From edc875593d3ddbd0fe86caf6380a62b00a20f245 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Mon, 9 Jan 2012 09:35:10 +0200
Subject: Fix a possible notice in Output library

---
 system/core/Output.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'system')

diff --git a/system/core/Output.php b/system/core/Output.php
index da5c29044..69a2e5f88 100755
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -397,14 +397,12 @@ class CI_Output {
 			// If the output data contains closing </body> and </html> tags
 			// we will remove them and add them back after we insert the profile data
 			$output = preg_replace('|</body>.*?</html>|is', '', $output, $count).$CI->profiler->run();
-			if ($count > 0)
+			if (isset($count) && $count > 0)
 			{
 				$output .= '</body></html>';
 			}
 		}
 
-		// --------------------------------------------------------------------
-
 		// Does the controller contain a function named _output()?
 		// If so send the output there.  Otherwise, echo it.
 		if (method_exists($CI, '_output'))
@@ -413,7 +411,7 @@ class CI_Output {
 		}
 		else
 		{
-			echo $output;  // Send it to the browser!
+			echo $output; // Send it to the browser!
 		}
 
 		log_message('debug', 'Final output sent to browser');
-- 
cgit v1.2.3-24-g4f1b


From cba20b164fdb1e60225b4f1fc04b7a31c4ffa106 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Mon, 9 Jan 2012 10:16:41 +0200
Subject: Really fix this ...

---
 system/core/Output.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'system')

diff --git a/system/core/Output.php b/system/core/Output.php
index 69a2e5f88..d27133d37 100755
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -396,8 +396,9 @@ class CI_Output {
 
 			// If the output data contains closing </body> and </html> tags
 			// we will remove them and add them back after we insert the profile data
-			$output = preg_replace('|</body>.*?</html>|is', '', $output, $count).$CI->profiler->run();
-			if (isset($count) && $count > 0)
+			$count = 0;
+			$output = preg_replace('|</body>.*?</html>|is', '', $output, -1, $count).$CI->profiler->run();
+			if ($count > 0)
 			{
 				$output .= '</body></html>';
 			}
-- 
cgit v1.2.3-24-g4f1b


From a96a9c8e6c7a113c808ba047808180b33360d3dd Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Mon, 9 Jan 2012 11:01:15 +0200
Subject: Remove once again ...

---
 system/core/Output.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'system')

diff --git a/system/core/Output.php b/system/core/Output.php
index d27133d37..abd8a0ea9 100755
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -396,7 +396,6 @@ class CI_Output {
 
 			// If the output data contains closing </body> and </html> tags
 			// we will remove them and add them back after we insert the profile data
-			$count = 0;
 			$output = preg_replace('|</body>.*?</html>|is', '', $output, -1, $count).$CI->profiler->run();
 			if ($count > 0)
 			{
-- 
cgit v1.2.3-24-g4f1b