Changeset 2981

Timestamp:

07/07/2008 12:51:57 PM (3 months ago)

Author:

Shadowhand

Message:

Added Kohana::close_buffers(), set Kohana::shutdown() to call close_buffers() rather than manually closing them.

Files:

• trunk/system/core/Kohana.php (modified) (2 diffs)

trunk/system/core/Kohana.php

@@ -334 +334 @@
 
         /**
+         * Closes all open output buffers, either by flushing or cleaning all
+         * open buffers, including the Kohana output buffer.
+         *
+         * @param   boolean  disable to clear buffers, rather than flushing
+         * @return  void
+         */
+        public static function close_buffers($flush = TRUE)
+        {
+                if (ob_get_level() >= self::$buffer_level)
+                {
+                        // Set the close function
+                        $close = ($flush === TRUE) ? 'ob_end_flush' : 'ob_end_clean';
+
+                        while (ob_get_level() > self::$buffer_level)
+                        {
+                                // Flush or clean the buffer
+                                $close();
+                        }
+
+                        // This will flush the Kohana buffer, which sets self::$output
+                        ob_end_clean();
+                }
+        }
+
+        /**
          * Triggers the shutdown of Kohana by closing the output buffer, runs the system.display event.
          *
@@ -340 +365 @@
         public static function shutdown()
         {
-                while (ob_get_level() > self::$buffer_level)
-                {
-                        // Flush all open output buffers above the internal buffer
-                        ob_end_flush();
-                }
-
-                // This will flush the Kohana buffer, which sets self::$output
-                (ob_get_level() === self::$buffer_level) and ob_end_clean();
+                // Close output buffers
+                self::close_buffers(TRUE);
 
                 // Run the output event