diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/core/Kohana.php | 8 | ||||
| -rw-r--r-- | system/libraries/Database.php | 12 |
2 files changed, 18 insertions, 2 deletions
diff --git a/system/core/Kohana.php b/system/core/Kohana.php index c934b12b..8027975d 100644 --- a/system/core/Kohana.php +++ b/system/core/Kohana.php @@ -325,6 +325,14 @@ final class Kohana { // Add SYSPATH as the last path self::$include_paths[] = SYSPATH; + + // Local fix for Kohana Ticket:2276 + self::$internal_cache['find_file_paths'] = array(); + if ( ! isset(self::$write_cache['find_file_paths'])) + { + // Write cache at shutdown + self::$write_cache['find_file_paths'] = TRUE; + } } return self::$include_paths; 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); |