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

* Api: Fix SQL error from doubled table name in group statement

Browse Source 
"Unknown column 'egw_tracker.egw_tracker.tr_id' in 'group statement'"
This commit is contained in:
nathangray 2020-01-28 14:05:23 -07:00
parent ec31d93af2
commit 2045c08e54
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/Storage.php
View File

@ -13,6 +13,8 @@
namespace EGroupware\Api;
use EGroupware\Api\Storage\Customfields;
/**
* Generalized SQL Storage Object with build in custom field support
*
@ -220,7 +222,7 @@ class Storage extends Storage\Base
{
$id = isset($data[$this->autoinc_id]) ? $data[$this->autoinc_id] : $data[$this->db_key_cols[$this->autoinc_id]];
\EGroupware\Api\Storage\Customfields::handle_files($this->app, $id, $data, $this->customfields);
Customfields::handle_files($this->app, $id, $data, $this->customfields);
foreach (array_keys((array)$this->customfields) as $name)
{
@ -586,7 +588,7 @@ class Storage extends Storage\Base
else if (stripos($col, 'AS') !== false && $order_by)
{
list($value, $alias) = explode(' AS ', $col);
if(stripos($order_by, $alias) !== FALSE)
if(stripos($order_by, $alias) !== FALSE && stripos($value, $this->table_name) === FALSE)
{
$order_by = str_replace($alias, $value, $order_by);
}