From da7f12289613d254fac7c51de5515003f80b29b0 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 22 Oct 2009 09:11:34 +0000 Subject: [PATCH] "can NOT call methods of common class static in 1.6 (available in trunk)" --- addressbook/inc/class.addressbook_merge.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addressbook/inc/class.addressbook_merge.inc.php b/addressbook/inc/class.addressbook_merge.inc.php index 8564689dec..9677d690a5 100644 --- a/addressbook/inc/class.addressbook_merge.inc.php +++ b/addressbook/inc/class.addressbook_merge.inc.php @@ -117,7 +117,7 @@ class addressbook_merge // extends bo_merge switch($field['type']) { case 'select-account': - if ($value) $value = common::grab_owner_name($value); + if ($value) $value = $GLOBALS['egw']->common->grab_owner_name($value); break; 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'); $date = array_combine(preg_split('/[\\/. :-]/',$format),preg_split('/[\\/. :-]/',$value)); - $value = common::dateformatorder($date['Y'],$date['m'],$date['d'],true); - if (isset($date['H'])) $value .= ' '.common::formattime($date['H'],$date['i']); + $value = $GLOBALS['egw']->common->dateformatorder($date['Y'],$date['m'],$date['d'],true); + if (isset($date['H'])) $value .= ' '.$GLOBALS['egw']->common->formattime($date['H'],$date['i']); } break; }