mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 06:30:59 +01:00
fixed stall in calendar update from 1.8: remove deleting from egw_api_content_history, which will be droped by 16.1 update, before calendar update is running
This commit is contained in:
parent
521de3a23f
commit
77f8b1b698
@ -1992,7 +1992,7 @@ function calendar_upgrade1_8()
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert bool column cal_deleted with egw_api_content_history table to a unix timestamp
|
||||
* Convert bool column cal_deleted to a unix timestamp
|
||||
*
|
||||
* Using cal_modified as deleted-timestamp, as querying it from SyncML tables creates too many problems (refresh table stops before copying all rows!)
|
||||
*
|
||||
@ -2000,12 +2000,6 @@ function calendar_upgrade1_8()
|
||||
*/
|
||||
function calendar_upgrade1_9_001()
|
||||
{
|
||||
// delete in the past wrongly created entries for a single recurrence, which mess up the update, beside being wrong anyway
|
||||
$GLOBALS['egw_setup']->db->delete('egw_api_content_history',array(
|
||||
'sync_appname' => 'calendar',
|
||||
"sync_contentid LIKE '%:%'",
|
||||
), __LINE__, __FILE__);
|
||||
|
||||
/* done by RefreshTable() anyway
|
||||
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_deleted',array(
|
||||
'type' => 'int',
|
||||
|
Loading…
Reference in New Issue
Block a user