summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-01-09 14:42:23 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-01-09 14:42:23 +0100
commit90dc964b9a06dce4f6e4f1d72d798672e1398cf9 (patch)
treef875bb843de74587ac0129071856d41690ebcee4 /system/core
parent2425f2f90331a014d3b276629089135fbd849a42 (diff)
parenta96a9c8e6c7a113c808ba047808180b33360d3dd (diff)
Merge pull request #901 from narfbg/develop-fix-output
Fix a possible notice in Output library
Diffstat (limited to 'system/core')
-rwxr-xr-xsystem/core/Output.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/system/core/Output.php b/system/core/Output.php
index da5c29044..abd8a0ea9 100755
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -396,15 +396,13 @@ 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();
+ $output = preg_replace('|</body>.*?</html>|is', '', $output, -1, $count).$CI->profiler->run();
if ($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');