Changeset 848 for trunk/system/libraries/Profiler.php

Timestamp:

10/18/2007 10:36:47 PM (14 months ago)

Author:

Shadowhand

Message:

Small fixes:

• Added ORM example at /orm/
  
• Fixed the syntax of Kohana::debug_output()
  
• Moved Database benchmarks to Database::query()
  
• Fixed profiler to handle new Database benchmark (static) location
  
• Database drivers now return the database connection resource instead of TRUE when calling connect()
  

Files:

• trunk/system/libraries/Profiler.php (modified) (2 diffs)

trunk/system/libraries/Profiler.php

@@ -53 +53 @@
                 (
                         'benchmarks' => array(),
-                        'queries'    => FALSE
+                        'queries'    => Database::$benchmarks
                 );
 
@@ -60 +60 @@
                 {
                         $data['benchmarks'][str_replace(SYSTEM_BENCHMARK.'_', '', $name)] = $time;
-                }
-
-                // Get database queries
-                if (isset(Kohana::instance()->db))
-                {
-                        $data['queries'] = Database::$benchmarks;
                 }