Merge branch 'master' of git://github.com/gallery/gallery3

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();
+			}
 		}
 	}