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

Revert "Thumbnails (and handling) of uploaded files on new entries that have not yet been saved" as it breaks sync

Browse Source 
This reverts commit 3e6c733e69.
This commit is contained in:
Ralf Becker 2017-04-15 17:20:05 +02:00
parent 1e4888b037
commit 3148138027
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1338,7 +1338,7 @@ ORDER BY cal_user_type, cal_usre_id
* @param int &$etag etag=null etag to check or null, on return new etag
* @return boolean|int false on error, 0 if etag does not match, cal_id otherwise
*/
function save(&$event,&$set_recurrences,&$set_recurrences_start=0,$change_since=0,&$etag=null)
function save($event,&$set_recurrences,&$set_recurrences_start=0,$change_since=0,&$etag=null)
{
if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
{
@ -1628,8 +1628,6 @@ ORDER BY cal_user_type, cal_usre_id
$this->participants($cal_id,$event['cal_participants'],!$cal_id ? false : $change_since);
}
// Custom fields
Api\Etemplate\Widget\Customfields::handle_files('calendar', $cal_id, $event);
foreach($event as $name => $value)
{
if ($name[0] == '#')

1
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -1586,7 +1586,6 @@ class calendar_uiforms extends calendar_ui
}
}
$content = array_merge($event,array(
'cal_id' => $event['id'],
'link_to' => array(
'to_id' => $link_to_id,
'to_app' => 'calendar',