Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Simplify add_table_prefixes. In Kohana 2.4, it returns the bare table

name, not the prefixed one so this makes our logic easier.
  • Loading branch information...
commit 2aba8c4bffed5fb38689d5ed998c486ab6bde902 1 parent c99a75b
Bharat Mediratta bharat authored
Showing with 4 additions and 11 deletions.
  1. +4 −11 modules/gallery/libraries/MY_Database.php
15 modules/gallery/libraries/MY_Database.php
View
@@ -25,7 +25,7 @@
* table prefix . $1
*/
public function query($sql = '') {
- if (!empty($sql)) {
+ if ($this->config["table_prefix"] && !empty($sql)) {
$sql = $this->add_table_prefixes($sql);
}
return parent::query($sql);
@@ -49,19 +49,12 @@ public function add_table_prefixes($sql) {
if (!isset($this->_table_names)) {
// This should only run once on the first query
- $this->_table_names =array();
- $len = strlen($prefix);
+ $this->_table_names = array();
foreach($this->list_tables() as $table_name) {
- 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;
+ $this->_table_names["{{$table_name}}"] = $prefix . $table_name;
}
}
- return empty($this->_table_names) ? $sql : strtr($sql, $this->_table_names);
+ return strtr($sql, $this->_table_names);
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.