deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

OSB Mod: Update to KH Database for OSB

Browse Source
This commit is contained in:
Deon George 2011-01-22 23:47:07 +11:00
parent ba3c9d60aa
commit 8715a2059b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/kohana/modules/database/classes/kohana/database/query/builder/select.php
View File

@ -76,6 +76,10 @@ class Kohana_Database_Query_Builder_Select extends Database_Query_Builder_Where
{ {
$columns = func_get_args(); $columns = func_get_args();
// Ignore our default select of .* if we already have some selected columns.
if (count($columns) == 1 AND is_string($columns[0]) AND preg_match('/\.\*$/',$columns[0]) AND $this->_select)
return $this;
$this->_select = array_merge($this->_select, $columns); $this->_select = array_merge($this->_select, $columns);
return $this; return $this;