stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-31 20:20:36 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
name, not the prefixed one so this makes our logic easier.
This commit is contained in:
Bharat Mediratta
2009-12-17 21:05:47 -08:00
parent c99a75b5d1
commit 2aba8c4bff
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/libraries/MY_Database.php
+4 -11
View File
@@ -25,7 +25,7 @@ abstract class Database extends Database_Core {
* 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 @@ abstract class Database extends Database_Core {
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);
}
}