diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
| commit | 3060a6f662da66008d57a461bf1c9b5b4aa2b002 (patch) | |
| tree | 442fd290505817efc0324f2af6e01805cb7396aa /system/libraries/Profiler_Table.php | |
| parent | 1cd6a615bb47a33794e4a4f690c87a348ab752d7 (diff) | |
| parent | 32d25dafd5b033338b6a9bb8c7c53edab462543a (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/controllers/albums.php
modules/gallery/controllers/movies.php
modules/gallery/controllers/photos.php
Diffstat (limited to 'system/libraries/Profiler_Table.php')
| -rw-r--r-- | system/libraries/Profiler_Table.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/system/libraries/Profiler_Table.php b/system/libraries/Profiler_Table.php index a0058a58..fdb62aef 100644 --- a/system/libraries/Profiler_Table.php +++ b/system/libraries/Profiler_Table.php @@ -2,12 +2,12 @@ /** * Provides a table layout for sections in the Profiler library. * - * $Id$ + * $Id: Profiler_Table.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Profiler * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class Profiler_Table_Core { @@ -26,7 +26,7 @@ class Profiler_Table_Core { if ( ! $styles_output) { $styles_output = TRUE; - return file_get_contents(Kohana::find_file('views', 'kohana_profiler_table', FALSE, 'css')); + return file_get_contents(Kohana::find_file('views', 'profiler/table', FALSE, 'css')); } return ''; @@ -64,6 +64,6 @@ class Profiler_Table_Core { { $data['rows'] = $this->rows; $data['columns'] = $this->columns; - return View::factory('kohana_profiler_table', $data)->render(); + return View::factory('profiler/table', $data)->render(); } }
\ No newline at end of file |