summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-03-14 11:46:34 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-03-14 11:46:34 +0100
commit0fe8c8e21315e00dbc06a87290fb268a2dc999a9 (patch)
tree4bc75acb95f49de7bf5df9ec3eb684bc39c93ad0 /system/libraries
parentca6404749a8dd3ee5dd68d64832374dce05fe6a3 (diff)
parent62c0647d241d556590d470ea27ac9aa36f609bfa (diff)
Merge branch 'feature/unit-tests' into develop
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Table.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Table.php b/system/libraries/Table.php
index 8651b9e69..08590c0e0 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;
}