From 808fd4d3a0f38a2ea80bb8d56e1f8c6ce499e42d Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Sun, 1 Nov 2009 09:32:42 -0800 Subject: Update the modified with a local fix for Kohana ticket #2298 --- system/libraries/Database.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'system') diff --git a/system/libraries/Database.php b/system/libraries/Database.php index 2039371c..4cd29c58 100644 --- a/system/libraries/Database.php +++ b/system/libraries/Database.php @@ -1031,8 +1031,12 @@ class Database_Core { $table = $this->from[0]; } + else + { + $table = $this->config['table_prefix'].$table; + } - $sql = $this->driver->merge($this->config['table_prefix'].$table, array_keys($this->set), array_values($this->set)); + $sql = $this->driver->merge($table, array_keys($this->set), array_values($this->set)); $this->reset_write(); return $this->query($sql); @@ -1068,8 +1072,12 @@ class Database_Core { $table = $this->from[0]; } + else + { + $table = $this->config['table_prefix'].$table; + } - $sql = $this->driver->update($this->config['table_prefix'].$table, $this->set, $this->where); + $sql = $this->driver->update($table, $this->set, $this->where); $this->reset_write(); return $this->query($sql); -- cgit v1.2.3