"fixed missing argument for $$creaed$$ and $$modified$$ placeholders, reported on the German list"

This commit is contained in:
Ralf Becker 2008-11-21 09:25:16 +00:00
parent cbc6214282
commit 6164f3f1e8

View File

@ -61,7 +61,7 @@ class addressbook_merge // extends bo_merge
{ {
case 'created': case 'modified': case 'created': case 'modified':
$value = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].' '. $value = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].' '.
($GLOBALS['egw_info']['user']['preferences']['common']['timeformat']==12?'h:i a':'H:i')); ($GLOBALS['egw_info']['user']['preferences']['common']['timeformat']==12?'h:i a':'H:i'),$value);
break; break;
case 'bday': case 'bday':
if ($value) if ($value)