Skip to content

Commit 546d07c

Browse files
committed
Patched according to @rjmackay's patch. Closes #52
1 parent 6d68e9a commit 546d07c

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

system/core/Kohana.php

+8-5
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,11 @@ public static function setup()
119119
// Restore error reporting
120120
error_reporting($ER);
121121

122-
// Start output buffering
123-
ob_start(array(__CLASS__, 'output_buffer'));
124-
122+
// Start output buffering
123+
ob_start(array(__CLASS__, 'output_buffer'));
124+
// Hack to support PHP 5.4 - we're now calling Kohana::output_buffer() manually in Kohana::close_buffers() - markiliffe 08-05-2013 (from rjmackay 20120914)
125+
ob_start(/*array(__CLASS__, 'output_buffer')*/);
126+
125127
// Save buffering level
126128
self::$buffer_level = ob_get_level();
127129

@@ -668,8 +670,9 @@ public static function close_buffers($flush = TRUE)
668670
}
669671

670672
// This will flush the Kohana buffer, which sets self::$output
671-
ob_end_clean();
672-
673+
// Hack to support PHP 5.4 - we're now calling Kohana::output_buffer() manually - markiliffe 08-05-2013 (from rjmackay 20120914)
674+
self::output_buffer(ob_get_contents());
675+
ob_end_clean();
673676
// Reset the buffer level
674677
self::$buffer_level = ob_get_level();
675678
}

0 commit comments

Comments
 (0)