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

* PostgreSQL/Calendar: clicking on InfoLog entries opened new calendar entry instead of existing InfoLog

Browse Source
This commit is contained in:
Ralf Becker 2013-10-15 11:30:01 +00:00
parent 6eb7b8ca92
commit 345a9bdc52
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.calendar_so.inc.php
View File

@ -918,6 +918,11 @@ class calendar_so
{
$cols = self::get_columns($required_app,substr($cols,0,-2));
}
// remove CAST added for PostgreSQL from eg. "CAST(egw_cal.cal_id AS varchar)"
elseif (preg_match('/CAST\(([a-z0-9_.]+) AS [a-z0-9_]+\)/i', $cols, $matches))
{
$cols = $matches[1];
}
elseif (strpos($cols,' AS ') !== false)
{
list(,$cols) = explode(' AS ',$cols);
@ -938,6 +943,7 @@ class calendar_so
}
}
}
//error_log(__METHOD__."(".array2string($app_cols).", ".array2string($required).", '$required_app') returning ".array2string(implode(',',$return_cols)));
return implode(',',$return_cols);
}