1 files changed, 5 insertions, 1 deletions
diff --git a/core/libraries/MY_Database.php b/core/libraries/MY_Database.php
index d54ac82b..31e263b2 100644
--- a/core/libraries/MY_Database.php
+++ b/core/libraries/MY_Database.php
@@ -77,7 +77,11 @@ class Database extends Database_Core {
       $this->_table_names =array();
       $len = strlen($prefix);
       foreach($this->list_tables() as $table_name) {
-        $naked_name = strpos($table_name, $prefix) !== 0 ? $table_name : substr($table_name, $len);
+        if ($len > 0) {
+          $naked_name = strpos($table_name, $prefix) !== 0 ? $table_name : substr($table_name, $len);
+        } else {
+          $naked_name = $table_name;
+        }
         $this->_table_names["{{$naked_name}}"] = $table_name;
       }
     }