holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some extra handling for potentially ambiguous columns in

Browse Source
This commit is contained in:
Nathan Gray 2010-04-08 22:13:22 +00:00
parent 215da11fae
commit 549626cbf9
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etemplate/inc/class.so_sql_cf.inc.php
View File

@ -457,6 +457,15 @@ class so_sql_cf extends so_sql
}
}
}
// replace ambiguous column with (an exact match of) table_name.column
if(is_array($only_keys)) {
foreach($only_keys as $key => &$col) {
if(is_numeric($key) && in_array($col, $this->db_cols)) {
$col = $this->table_name .'.'.array_search($col, $this->db_cols);
}
}
}
// check if we order by a custom field --> join cf table for given cf and order by it's value
if (strpos($order_by,self::CF_PREFIX) !== false &&
preg_match('/'.self::CF_PREFIX.'([^ ]+) (asc|desc)/i',$order_by,$matches))