diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index 938c46e..88ab461 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -75,8 +75,7 @@
{
$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 0f2c49d..61d04ee 100644
--- a/system/libraries/Table.php
+++ b/system/libraries/Table.php
@@ -211,9 +211,13 @@
}
// 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;
+ }
}
}