summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2012-04-23 20:31:36 -0700
committerBharat Mediratta <bharat@menalto.com>2012-04-23 20:31:36 -0700
commit6b306cddc1f25ecfe054b0a1c9d0dc3536da51f6 (patch)
tree27ab19699a2eabf047f7e624f632535536be8230 /system
parenta6a07c8580aa09063e39c407922a2cc197b4f05c (diff)
Don't call ob_end_clean() if PHP >= 5.4. Fixes #1839. Thanks to
Christopher Kunz and Avuton Olrich for the info.
Diffstat (limited to 'system')
-rw-r--r--system/core/Kohana.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/system/core/Kohana.php b/system/core/Kohana.php
index f7f6b326..96d969ed 100644
--- a/system/core/Kohana.php
+++ b/system/core/Kohana.php
@@ -525,8 +525,12 @@ abstract class Kohana_Core {
$close();
}
- // Store the Kohana output buffer
- ob_end_clean();
+ // Store the Kohana output buffer. Apparently there was a change in PHP
+ // 5.4 such that if you call this you wind up with a blank page.
+ // Disabling it for now. See ticket #1839
+ if (version_compare(PHP_VERSION, "5.4", "<")) {
+ ob_end_clean();
+ }
}
}