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

Fix missing info_from values, caused by a (fixed) bug

Browse Source
This commit is contained in:
Ralf Becker 2008-03-31 17:05:12 +00:00
parent eaf78fec36
commit 29f8fd618c
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@
*/
$setup_info['infolog']['name'] = 'infolog';
$setup_info['infolog']['version'] = '1.5.001';
$setup_info['infolog']['version'] = '1.5.002';
$setup_info['infolog']['app_order'] = 5;
$setup_info['infolog']['tables'] = array('egw_infolog','egw_infolog_extra');
$setup_info['infolog']['enable'] = 1;

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

@ -588,4 +588,26 @@
return $GLOBALS['setup_info']['infolog']['currentver'] = '1.5.001';
}
?>
$test[] = '1.5.001';
/**
* Fix missing info_from values, caused by a (fixed) bug
*
* @return string version
*/
function infolog_upgrade1_5_001()
{
foreach($GLOBALS['egw_setup']->db->select('egw_infolog','info_id,info_link_id,org_name,adr_one_locality,n_family,n_given',array(
'info_from' => '',
'info_link_id > 0',
),__LINE__,__FILE__,false,'','infolog',0,
" JOIN egw_links ON info_link_id=link_id AND link_app2='addressbook'".
" JOIN egw_addressbook ON contact_id=link_id2") as $row)
{
$from = ($row['org_name'] ? $row['org_name'].', '.$row['adr_one_locality'].': ' : '').
$row['n_family'].($row['n_given'] ? ', '.$row['n_given'] : '');
$GLOBALS['egw_setup']->db->update('egw_infolog',array('info_from' => $from),
array('info_id' => $row['info_id']),__LINE__,__FILE__,'infolog');
}
return $GLOBALS['setup_info']['infolog']['currentver'] = '1.5.002';
}