From 28114e0ed1805cd01ce143d18a50bef86334c47c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cornelius=20Wei=C3=9F?= Date: Fri, 24 Aug 2007 12:50:45 +0000 Subject: [PATCH] fix for dst in cal import --- .../inc/class.import_export_helper_functions.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/importexport/inc/class.import_export_helper_functions.inc.php b/importexport/inc/class.import_export_helper_functions.inc.php index 2933ddaaed..0e94467072 100755 --- a/importexport/inc/class.import_export_helper_functions.inc.php +++ b/importexport/inc/class.import_export_helper_functions.inc.php @@ -29,8 +29,9 @@ class import_export_helper_functions { * If timestring is empty, php strtotime is used. * @param string $_string time string to convert * @param string $_format format of time string e.g.: d.m.Y H:i + * @param int $_is_dst is day light saving time? 0 = no, 1 = yes, -1 = system default */ - public static function custom_strtotime( $_string, $_format='' ) { + public static function custom_strtotime( $_string, $_format='', $_is_dst = -1) { if ( empty( $_format ) ) return strtotime( $_string ); $fparams = explode( ',', chunk_split( $_format, 1, ',' ) ); $spos = 0; @@ -53,7 +54,7 @@ class import_export_helper_functions { } print_debug("hour:$hour; min:$min; sec:$sec; mon:$mon; day:$day; year:$year;\n"); - $timestamp = mktime($hour, $min, $sec, $mon, $day, $year, 0); + $timestamp = mktime($hour, $min, $sec, $mon, $day, $year, $_is_dst); // offset given? if ( isset( $offset ) && strlen( $offset == 5 ) ) {