Author: ralfbecker
New Revision: 25222
URL: http://www.egroupware.org/viewvc?rev=3D25222&view=3Drev
Log:
Fix missing info_from values, caused by a (fixed) bug
Modified:
trunk/infolog/setup/setup.inc.php
trunk/infolog/setup/tables_update.inc.php
Modified: trunk/infolog/setup/setup.inc.php
URL: http://www.egroupware.org/viewvc/trunk/infolog/setup/setup.inc.php?rev=
=3D25222&r1=3D25221&r2=3D25222&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
— trunk/infolog/setup/setup.inc.php (original)
+++ trunk/infolog/setup/setup.inc.php Mon Mar 31 19:05:12 2008
@@ -12,7 +12,7 @@
*/
$setup_info[‘infolog’][‘name’] =3D ‘infolog’;
-$setup_info[‘infolog’][‘version’] =3D ‘1.5.001’;
+$setup_info[‘infolog’][‘version’] =3D ‘1.5.002’;
$setup_info[‘infolog’][‘app_order’] =3D 5;
$setup_info[‘infolog’][‘tables’] =3D array(‘egw_infolog’,‘egw_infolog_e=
xtra’);
$setup_info[‘infolog’][‘enable’] =3D 1;
Modified: trunk/infolog/setup/tables_update.inc.php
URL: http://www.egroupware.org/viewvc/trunk/infolog/setup/tables_update.inc=
.php?rev=3D25222&r1=3D25221&r2=3D25222&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
— trunk/infolog/setup/tables_update.inc.php (original)
+++ trunk/infolog/setup/tables_update.inc.php Mon Mar 31 19:05:12 2008
@@ -588,4 +588,26 @@
return $GLOBALS['setup_info']['infolog']['currentver'] =3D '1.5.001';
}
-?>
+
- $test[] =3D ‘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_li=
nk_id,org_name,adr_one_locality,n_family,n_given’,array(
-
'info_from' =3D> '', -
'info_link_id > 0', -
),__LINE__,__FILE__,false,'','infolog',0, -
" JOIN egw_links ON info_link_id=3Dlink_id AND link_app2=3D'addressbook'=
".
-
" JOIN egw_addressbook ON contact_id=3Dlink_id2") as $row) -
{ -
$from =3D ($row['org_name'] ? $row['org_name'].', '.$row['adr_one_local=
ity’].’: ’ : ‘’).
-
$row['n_family'].($row['n_given'] ? ', '.$row['n_given'] : ''); -
$GLOBALS['egw_setup']->db->update('egw_infolog',array('info_from' =3D> =
$from),
-
array('info_id' =3D> $row['info_id']),__LINE__,__FILE__,'infolog'); -
} -
return $GLOBALS['setup_info']['infolog']['currentver'] =3D '1.5.002'; - }
Check out the new SourceForge.net Marketplace.
It’s the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs