extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 01:52:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix copy/paste error to get address merging working

Browse Source
This commit is contained in:
Nathan Gray 2010-04-15 14:56:37 +00:00
parent db6c6cd462
commit 2aed9e476f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -446,14 +446,14 @@ class so_sql_cf extends so_sql
unset($criteria[$this->autoinc_id]);
}
// replace ambiguous column with (an exact match of) table_name.column
elseif (is_string($name) && $val!=null && in_array($name, $this->db_cols))
foreach($criteria as $name => $val)
{
$extra_columns = $this->db->get_table_definitions($app, $this->extra_table);
if($extra_columns['fd'][array_search($name, $this->db_cols)]) {
$filter[] = $this->db->expression($this->table_name,$this->table_name.'.',array(
$criteria[] = $this->db->expression($this->table_name,$this->table_name.'.',array(
array_search($name, $this->db_cols) => $val,
));
unset($filter[$name]);
unset($criteria[$name]);
}
}
}