From bd273c1b45f94fd8ceab10dbb08e3e9a5e08ef13 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 2 Mar 2012 09:53:41 +0000 Subject: [PATCH] fixed typo in setting date- and time-format in egw_time::check_set_tz_offset(), causing eg. importexport to fail, if async job before had no account or account had different format --- phpgwapi/inc/class.preferences.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpgwapi/inc/class.preferences.inc.php b/phpgwapi/inc/class.preferences.inc.php index 87a89dba59..89b86f4507 100644 --- a/phpgwapi/inc/class.preferences.inc.php +++ b/phpgwapi/inc/class.preferences.inc.php @@ -425,7 +425,7 @@ class preferences if (!empty($prefs['tz'])) { - egw_time::setUserPrefs($prefs['tz'],$prefs['date_format'],$prefs['time_format']); + egw_time::setUserPrefs($prefs['tz'],$prefs['dateformat'],$prefs['timeformat']); // set the old preference for compatibilty with old code $GLOBALS['egw_info']['user']['preferences']['common']['tz_offset'] = egw_time::tz_offset_s()/3600; //echo "

".__METHOD__."() tz=$prefs[tz] --> tz_offset={$GLOBALS['egw_info']['user']['preferences']['common']['tz_offset']}

\n";