summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authoradmin <devnull@localhost>2006-10-11 21:16:58 +0200
committeradmin <devnull@localhost>2006-10-11 21:16:58 +0200
commit4003718f35247ef9b4a8d678389bda639677bac7 (patch)
tree9cb7a9a559b5adfc4f5c6139078b4753aecb544d /system/libraries
parent2799120c10b8d2544dd71e37b3a48c1eaa834c48 (diff)
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Controller.php3
-rw-r--r--system/libraries/Table.php8
2 files changed, 7 insertions, 4 deletions
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index 938c46e4c..88ab46164 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -75,8 +75,7 @@ class Controller extends CI_Base {
{
$this->$var =& load_class($class);
}
-
-
+
// In PHP 5 the Controller class is run as a discreet
// class. In PHP 4 it extends the Controller
if (floor(phpversion()) >= 5)
diff --git a/system/libraries/Table.php b/system/libraries/Table.php
index 0f2c49d96..61d04eef5 100644
--- a/system/libraries/Table.php
+++ b/system/libraries/Table.php
@@ -211,9 +211,13 @@ class CI_Table {
}
// Next blast through the result array and build out the rows
- foreach ($query->result_array() as $row)
+
+ if ($query->num_rows() > 0)
{
- $this->rows[] = $row;
+ foreach ($query->result_array() as $row)
+ {
+ $this->rows[] = $row;
+ }
}
}