You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardexpand all lines: system/core/Kohana.php
+8-5
Original file line number
Diff line number
Diff line change
@@ -119,9 +119,11 @@ public static function setup()
119
119
// Restore error reporting
120
120
error_reporting($ER);
121
121
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
+
125
127
// Save buffering level
126
128
self::$buffer_level = ob_get_level();
127
129
@@ -668,8 +670,9 @@ public static function close_buffers($flush = TRUE)
668
670
}
669
671
670
672
// 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)
0 commit comments