summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-03-11 03:01:30 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-03-11 03:01:30 +0100
commit6efbe5d7312698c73bbd645950ff5c81793b21e7 (patch)
treeeb647bc246487f444ea1ffd4e24317ab0200bf30 /system
parente40c763bf969acbaa7c4c61be50f01e870062080 (diff)
parent8749bc7e836c196dfef37d3b7b5a67736a15092c (diff)
Merge pull request #1161 from toopay/unit-tests
Unit Tests marked as "Incomplete" now completed.
Diffstat (limited to 'system')
-rwxr-xr-xsystem/core/Config.php2
-rw-r--r--system/libraries/Table.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/system/core/Config.php b/system/core/Config.php
index 68417435d..5424e5eb1 100755
--- a/system/core/Config.php
+++ b/system/core/Config.php
@@ -76,7 +76,7 @@ class CI_Config {
log_message('debug', 'Config Class Initialized');
// Set the base_url automatically if none was provided
- if ($this->config['base_url'] == '')
+ if (empty($this->config['base_url']))
{
if (isset($_SERVER['HTTP_HOST']))
{
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;
}