diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-20 14:34:17 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-20 14:34:17 +0100 |
| commit | 407219ddff7e11516c7f295ee3e07c31ba3fe9ee (patch) | |
| tree | 55f910d2f6d57f6436f28b7ce06666d77f41d6bc /system/libraries/Table.php | |
| parent | 99f31cd1a487d209fd9632b40baf12406bd897c1 (diff) | |
| parent | 820999cb0d82c80d6dc5dde133568812c8113e29 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-zip
Diffstat (limited to 'system/libraries/Table.php')
| -rw-r--r-- | system/libraries/Table.php | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/system/libraries/Table.php b/system/libraries/Table.php index fb154e50f..11a4858a9 100644 --- a/system/libraries/Table.php +++ b/system/libraries/Table.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * @@ -25,8 +25,6 @@ * @filesource */ -// ------------------------------------------------------------------------ - /** * HTML Table Generating Class * @@ -49,9 +47,21 @@ class CI_Table { public $empty_cells = ''; public $function = FALSE; - public function __construct() + /** + * Set the template from the table config file if it exists + * + * @param array $config (default: array()) + * @return void + */ + public function __construct($config = array()) { - log_message('debug', "Table Class Initialized"); + log_message('debug', 'Table Class Initialized'); + + // initialize config + foreach ($config as $key => $val) + { + $this->template[$key] = $val; + } } // -------------------------------------------------------------------- @@ -102,7 +112,7 @@ class CI_Table { */ public function make_columns($array = array(), $col_limit = 0) { - if ( ! is_array($array) OR count($array) === 0) + if ( ! is_array($array) OR count($array) === 0 OR ! is_int($col_limit)) { return FALSE; } @@ -395,7 +405,7 @@ class CI_Table { // First generate the headings from the table column names if (count($this->heading) === 0) { - if ( ! method_exists($query, 'list_fields')) + if ( ! is_callable(array($query, 'list_fields'))) { return FALSE; } |