extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

"an other fix: if there's already an explicit named column, just use that name"

Browse Source
This commit is contained in:
Ralf Becker 2010-04-20 08:12:22 +00:00
parent 4756705182
commit 423dbbc567
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etemplate/inc/class.so_sql.inc.php
View File

@ -986,7 +986,6 @@ class so_sql
}
$rs = $this->db->select($this->table_name,$mysql_calc_rows.$colums,$query,__LINE__,__FILE__,
$start,$order_by,$this->app,$num_rows,$join);
$cols = $this->_get_columns($only_keys,$extra_cols);
}
if ((int) $this->debug >= 4) echo "<p>sql='{$this->db->Query_ID->sql}'</p>\n";
@ -1253,7 +1252,12 @@ class so_sql
}
else // only the specified columns
{
if (stripos($col,'as')!==false) $col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
if (stripos($col,'as')) // if there's already an explicit naming of the column, just use it
{
$col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
$cols[$col] = $col;
continue;
}
if (($db_col = array_search($col,$this->db_cols)) !== false)
{
$cols[$db_col] = $col;