extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

* InfoLog: fix delegation no longer shown after database restore

Browse Source
This commit is contained in:
Ralf Becker 2019-09-24 11:07:46 +02:00
parent d602ec6677
commit 21a44891ed
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/Db/Backup.php
View File

@ -765,7 +765,10 @@ class Backup
// decode bool columns, they might be 't'/'f' for old PostgreSQL backups
foreach($bools as $key)
{
$fields[$key] = Api\Db::from_bool($fields[$key]);
if (isset($fields[$key])) // do NOT replace NULL with false/0
{
$fields[$key] = Api\Db::from_bool($fields[$key]);
}
}
}
return $fields;
@ -797,7 +800,7 @@ class Backup
{
$arr[$key] = base64_decode($field);
}
elseif (in_array($key, $bools))
elseif ($field !== 'NULL' && in_array($key, $bools))
{
$arr[$key] = Api\Db::from_bool($field);
}

2
infolog/setup/setup.inc.php
View File

@ -11,7 +11,7 @@
*/
$setup_info['infolog']['name'] = 'infolog';
$setup_info['infolog']['version'] = '19.1';
$setup_info['infolog']['version'] = '19.1.001';
$setup_info['infolog']['app_order'] = 5;
$setup_info['infolog']['tables'] = array('egw_infolog','egw_infolog_extra','egw_infolog_users');
$setup_info['infolog']['enable'] = 1;

13
infolog/setup/tables_update.inc.php
View File

@ -1108,3 +1108,16 @@ function infolog_upgrade17_1_001()
{
return $GLOBALS['setup_info']['infolog']['currentver'] = '19.1';
}
/**
* Fix egw_infolog_users.info_res_deleted=0 --> NULL
*
* @return string
*/
function infolog_upgrade19_1()
{
$GLOBALS['egw_setup']->db->query("UPDATE egw_infolog_users SET info_res_deleted=NULL WHERE info_res_deleted=".
$GLOBALS['egw_setup']->db->quote(false, 'bool'));
return $GLOBALS['setup_info']['infolog']['currentver'] = '19.1.001';
}