diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-20 14:40:56 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-20 14:40:56 +0100 |
| commit | 84a3b25b11da0f5b69c9a128cd79b98bfb70dc30 (patch) | |
| tree | a5fd16fe0ae7b0ab3e8ee9a56683da7c3cc7225a /system/libraries/Table.php | |
| parent | 75124a53cf54f2a8c094756f9189be9159957f28 (diff) | |
| parent | 820999cb0d82c80d6dc5dde133568812c8113e29 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-helpers-sst
Diffstat (limited to 'system/libraries/Table.php')
| -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 99d001ce5..11a4858a9 100644 --- a/system/libraries/Table.php +++ b/system/libraries/Table.php @@ -112,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; } @@ -405,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; } |