extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-01 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

"can NOT call methods of common class static in 1.6 (available in trunk)"

Browse Source
This commit is contained in:
Ralf Becker 2009-10-22 09:11:34 +00:00
parent dbcd815fb5
commit da7f122896
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addressbook/inc/class.addressbook_merge.inc.php
View File

@ -117,7 +117,7 @@ class addressbook_merge // extends bo_merge
switch($field['type']) switch($field['type'])
{ {
case 'select-account': case 'select-account':
if ($value) $value = common::grab_owner_name($value); if ($value) $value = $GLOBALS['egw']->common->grab_owner_name($value);
break; break;
case 'select': case 'select':
@ -139,8 +139,8 @@ class addressbook_merge // extends bo_merge
{ {
$format = $field['len'] ? $field['len'] : ($field['type'] == 'date' ? 'Y-m-d' : 'Y-m-d H:i:s'); $format = $field['len'] ? $field['len'] : ($field['type'] == 'date' ? 'Y-m-d' : 'Y-m-d H:i:s');
$date = array_combine(preg_split('/[\\/. :-]/',$format),preg_split('/[\\/. :-]/',$value)); $date = array_combine(preg_split('/[\\/. :-]/',$format),preg_split('/[\\/. :-]/',$value));
$value = common::dateformatorder($date['Y'],$date['m'],$date['d'],true); $value = $GLOBALS['egw']->common->dateformatorder($date['Y'],$date['m'],$date['d'],true);
if (isset($date['H'])) $value .= ' '.common::formattime($date['H'],$date['i']); if (isset($date['H'])) $value .= ' '.$GLOBALS['egw']->common->formattime($date['H'],$date['i']);
} }
break; break;
} }