aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/event.php3
-rw-r--r--mod/events.php24
2 files changed, 17 insertions, 10 deletions
diff --git a/include/event.php b/include/event.php
index f37cdc6d5..9d4a8df59 100644
--- a/include/event.php
+++ b/include/event.php
@@ -175,6 +175,9 @@ function ev_compare($a,$b) {
$date_a = (($a['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$a['start']) : $a['start']);
$date_b = (($b['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$b['start']) : $b['start']);
+
+ if($date_a === $date_b)
+ return strcasecmp($a['desc'],$b['desc']);
return strcmp($date_a,$date_b);
}
diff --git a/mod/events.php b/mod/events.php
index b900eb29d..07231eb05 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -267,19 +267,23 @@ dbg(0);
$sdt = ((x($orig_event)) ? $orig_event['start'] : 'now');
$fdt = ((x($orig_event)) ? $orig_event['finish'] : 'now');
- $syear = datetime_convert('UTC', date_default_timezone_get(), $sdt, 'Y');
- $smonth = datetime_convert('UTC', date_default_timezone_get(), $sdt, 'm');
- $sday = datetime_convert('UTC', date_default_timezone_get(), $sdt, 'd');
+ $tz = ((x($orig_event) && $orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
+
- $shour = ((x($orig_event)) ? datetime_convert('UTC', date_default_timezone_get(), $sdt, 'H') : 0);
- $sminute = ((x($orig_event)) ? datetime_convert('UTC', date_default_timezone_get(), $sdt, 'i') : 0);
- $fyear = datetime_convert('UTC', date_default_timezone_get(), $fdt, 'Y');
- $fmonth = datetime_convert('UTC', date_default_timezone_get(), $fdt, 'm');
- $fday = datetime_convert('UTC', date_default_timezone_get(), $fdt, 'd');
+ $syear = datetime_convert('UTC', $tz, $sdt, 'Y');
+ $smonth = datetime_convert('UTC', $tz, $sdt, 'm');
+ $sday = datetime_convert('UTC', $tz, $sdt, 'd');
- $fhour = ((x($orig_event)) ? datetime_convert('UTC', date_default_timezone_get(), $fdt, 'H') : 0);
- $fminute = ((x($orig_event)) ? datetime_convert('UTC', date_default_timezone_get(), $fdt, 'i') : 0);
+ $shour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'H') : 0);
+ $sminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'i') : 0);
+
+ $fyear = datetime_convert('UTC', $tz, $fdt, 'Y');
+ $fmonth = datetime_convert('UTC', $tz, $fdt, 'm');
+ $fday = datetime_convert('UTC', $tz, $fdt, 'd');
+
+ $fhour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'H') : 0);
+ $fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : 0);
require_once('include/acl_selectors.php');