From 6164f3f1e873b466811ff8cf6c630da02bd5bf4f Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 21 Nov 2008 09:25:16 +0000 Subject: [PATCH] "fixed missing argument for $$creaed$$ and $$modified$$ placeholders, reported on the German list" --- addressbook/inc/class.addressbook_merge.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addressbook/inc/class.addressbook_merge.inc.php b/addressbook/inc/class.addressbook_merge.inc.php index 89592ae7e5..b72504b15d 100644 --- a/addressbook/inc/class.addressbook_merge.inc.php +++ b/addressbook/inc/class.addressbook_merge.inc.php @@ -61,7 +61,7 @@ class addressbook_merge // extends bo_merge { case 'created': case 'modified': $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; case 'bday': if ($value)