diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-03-11 03:01:30 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-03-11 03:01:30 +0100 |
| commit | 6efbe5d7312698c73bbd645950ff5c81793b21e7 (patch) | |
| tree | eb647bc246487f444ea1ffd4e24317ab0200bf30 /system/libraries | |
| parent | e40c763bf969acbaa7c4c61be50f01e870062080 (diff) | |
| parent | 8749bc7e836c196dfef37d3b7b5a67736a15092c (diff) | |
Merge pull request #1161 from toopay/unit-tests
Unit Tests marked as "Incomplete" now completed.
Diffstat (limited to 'system/libraries')
| -rw-r--r-- | system/libraries/Table.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Table.php b/system/libraries/Table.php index fb154e50f..8f6ac8d45 100644 --- a/system/libraries/Table.php +++ b/system/libraries/Table.php @@ -102,7 +102,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 +395,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; } |