Merge branch 'm20_MDL-14934_excel_time' of github.com:dongsheng/moodle

2010-12-20 12:21:21 +01:00
parent 81284044d8 869bbb302b
commit 011c956ba1
1 changed files with 7 additions and 1 deletions
@@ -212,7 +212,13 @@ class MoodleExcelWorksheet {
        $format = $this->MoodleExcelFormat2PearExcelFormat($format);
    /// Convert the date to Excel format
        $timezone = get_user_timezone_offset();
-        $value =  ((usertime($date) + (int)($timezone * HOURSECS * 2)) / 86400) + 25569;
+        if ($timezone == 99) {
+            // system timezone offset in seconds
+            $offset = (int)date('Z');
+        } else {
+            $offset = (int)($timezone * HOURSECS * 2);
+        }
+        $value = ((usertime($date) + $offset) / 86400) + 25569;
    /// Add  the date safely to the PEAR Worksheet
        $this->pear_excel_worksheet->writeNumber($row, $col, $value, $format);
    }