diff options
Diffstat (limited to 'kohana/libraries')
| -rw-r--r-- | kohana/libraries/ORM.php | 3 | ||||
| -rw-r--r-- | kohana/libraries/Profiler.php | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/kohana/libraries/ORM.php b/kohana/libraries/ORM.php index fbbe9b92..1984b933 100644 --- a/kohana/libraries/ORM.php +++ b/kohana/libraries/ORM.php @@ -1285,7 +1285,8 @@ class ORM_Core { */ protected function load_type($column, $value) { - if (is_object($value) OR is_array($value) OR ! isset($this->table_columns[$column])) + $type = gettype($value); + if ($type == 'object' OR $type == 'array' OR ! isset($this->table_columns[$column])) return $value; // Load column data diff --git a/kohana/libraries/Profiler.php b/kohana/libraries/Profiler.php index 9888baae..3c2a460d 100644 --- a/kohana/libraries/Profiler.php +++ b/kohana/libraries/Profiler.php @@ -133,7 +133,8 @@ class Profiler_Core { $table->add_column(); $table->add_column('kp-column kp-data'); $table->add_column('kp-column kp-data'); - $table->add_row(array('Benchmarks', 'Time', 'Memory'), 'kp-title', 'background-color: #FFE0E0'); + $table->add_column('kp-column kp-data'); + $table->add_row(array('Benchmarks', 'Time', 'Count', 'Memory'), 'kp-title', 'background-color: #FFE0E0'); $benchmarks = Benchmark::get(TRUE); @@ -146,7 +147,7 @@ class Profiler_Core { // Clean unique id from system benchmark names $name = ucwords(str_replace(array('_', '-'), ' ', str_replace(SYSTEM_BENCHMARK.'_', '', $name))); - $data = array($name, number_format($benchmark['time'], 3), number_format($benchmark['memory'] / 1024 / 1024, 2).'MB'); + $data = array($name, number_format($benchmark['time'], 3), $benchmark['count'], number_format($benchmark['memory'] / 1024 / 1024, 2).'MB'); $class = text::alternate('', 'kp-altrow'); if ($name == 'Total Execution') |