summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-08-14 20:10:55 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-08-14 20:10:55 +0200
commitd8ef630f2d4d32eee998969e548d36dc629340d4 (patch)
tree92a509fda736fb9a6a119dcb6b16c40607ed0fa5 /system/database
parent02d45b56c57f6cf9f8c0fabe7f8b7ed761bd5a9b (diff)
parentc2a37669107829b032b08562e784416713f569b1 (diff)
Fixed conflict.
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_forge.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
index a71fca78f..0dd29c238 100644
--- a/system/database/DB_forge.php
+++ b/system/database/DB_forge.php
@@ -234,7 +234,7 @@ class CI_DB_forge {
show_error('A table name is required for that operation.');
}
- $sql = $this->_rename_table($table_name, $new_table_name);
+ $sql = $this->_rename_table($this->db->dbprefix.$table_name, $this->db->dbprefix.$new_table_name);
return $this->db->query($sql);
}