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

fixed 2 join-related bugs

Browse Source
This commit is contained in:
Ralf Becker 2005-04-22 13:49:36 +00:00
parent c651776aca
commit 9d43446af2
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -460,8 +460,11 @@ class so_sql
{ {
if ($val !== '') if ($val !== '')
{ {
if (!is_numeric($col)) $col = array_search($col,$this->db_cols); // check if a db-internal name conversation necessary
if (!is_numeric($col) && ($c = array_search($col,$this->db_cols)))
{
$col = $c;
}
$db_filter[$col] = $val; $db_filter[$col] = $val;
} }
} }
@ -480,7 +483,7 @@ class so_sql
} }
if ($start !== false) // need to get the total too, saved in $this->total if ($start !== false) // need to get the total too, saved in $this->total
{ {
$this->db->select($this->table_name,'COUNT(*)',$query,__LINE__,__FILE__,false,'',false,0,$join); $this->db->select($this->table_name,'COUNT(*)',$query,__LINE__,__FILE__);
$this->total = $this->db->next_record() ? (int) $this->db->f(0) : false; $this->total = $this->db->next_record() ? (int) $this->db->f(0) : false;
} }
$this->db->select($this->table_name,($only_keys === true ? implode(',',$this->db_key_cols) : (!$only_keys ? '*' : $only_keys)). $this->db->select($this->table_name,($only_keys === true ? implode(',',$this->db_key_cols) : (!$only_keys ? '*' : $only_keys)).