diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-01-27 13:08:38 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-01-27 13:08:38 +0100 |
| commit | f00191c02985fba1e360a22ad914c547696df1b2 (patch) | |
| tree | 76c2d963be0b7c70705369ca4a9f82946df8bba8 /system/libraries/Profiler.php | |
| parent | 5dd84d04294b622f8b85f8aaac54d8329a2ae173 (diff) | |
| parent | 3bb336cf1c55584bb92ed32563a9543ec7f01574 (diff) | |
Automated merge with http://hg.ellislab.com/CodeIgniter-Reactor
Diffstat (limited to 'system/libraries/Profiler.php')
| -rw-r--r-- | system/libraries/Profiler.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index e7d88b665..6587eae0b 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2010, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 @@ -182,7 +182,7 @@ class CI_Profiler { { $output .= '<fieldset style="border:1px solid #0000FF;padding:6px 10px 10px 10px;margin:20px 0 20px 0;background-color:#eee">'; $output .= "\n"; - $output .= '<legend style="color:#0000FF;"> '.$this->CI->lang->line('profiler_database').': '.$db->database.' '.$this->CI->lang->line('profiler_queries').': '.count($this->CI->db->queries).' </legend>'; + $output .= '<legend style="color:#0000FF;"> '.$this->CI->lang->line('profiler_database').': '.$db->database.' '.$this->CI->lang->line('profiler_queries').': '.count($db->queries).' </legend>'; $output .= "\n"; $output .= "\n\n<table style='width:100%;'>\n"; |