Changeset 2564

Timestamp:

04/24/2008 09:28:05 PM (7 months ago)

Author:

Shadowhand

Message:

Added core.render_stats configuration option.

NOTE: This must be added to existing configuration files that are used with trunk!

Location:

trunk

Files:

• application/config/config.php (modified) (1 diff)
• system/core/Kohana.php (modified) (1 diff)

trunk/application/config/config.php

@@ -54 +54 @@
 
 /**
+ * Enable or display statistics in the final output. Stats are replaced via
+ * specific strings, such as {execution_time}.
+ *
+ * @see http://doc.kohanaphp.com/general/configuration/config
+ */
+$config['render_stats'] = FALSE;
+
+/**
  * Filename prefixed used to determine extensions. For example, an
  * extension to the Controller class would be named MY_Controller.php.

trunk/system/core/Kohana.php

@@ -367 +367 @@
                 $benchmark = Benchmark::get(SYSTEM_BENCHMARK.'_total_execution');
 
-                // Replace the global template variables
-                $output = str_replace(
-                        array
-                        (
-                                '{kohana_version}',
-                                '{kohana_codename}',
-                                '{execution_time}',
-                                '{memory_usage}',
-                                '{included_files}',
-                        ),
-                        array
-                        (
-                                KOHANA_VERSION,
-                                KOHANA_CODENAME,
-                                $benchmark['time'],
-                                number_format($memory, 2).'MB',
-                                count(get_included_files()),
-                        ),
-                        $output
-                );
-
-                if (ini_get('output_handler') != 'ob_gzhandler' AND ini_get('zlib.output_compression') == 0 AND $level = Config::item('core.output_compression'))
+                if (Config::item('core.render_stats') === TRUE)
+                {
+                        // Replace the global template variables
+                        $output = str_replace(
+                                array
+                                (
+                                        '{kohana_version}',
+                                        '{kohana_codename}',
+                                        '{execution_time}',
+                                        '{memory_usage}',
+                                        '{included_files}',
+                                ),
+                                array
+                                (
+                                        KOHANA_VERSION,
+                                        KOHANA_CODENAME,
+                                        $benchmark['time'],
+                                        number_format($memory, 2).'MB',
+                                        count(get_included_files()),
+                                ),
+                                $output
+                        );
+                }
+
+                if ($level = Config::item('core.output_compression') AND ini_get('output_handler') !== 'ob_gzhandler' AND (int) ini_get('zlib.output_compression') === 0)
                 {
                         if ($level < 1 OR $level > 9)