summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-06-16 18:11:40 +0200
committerAndrey Andreev <narf@bofh.bg>2012-06-16 18:11:40 +0200
commitb089e15b1510de6b6a034631c80d3d5e830ff9f3 (patch)
tree5202519894737668faacee99c386a2453c7bce68 /system
parent1764dd7d4ab6e6e5c799eaa9ce007fce48fa0b63 (diff)
Fix local_to_gmt()
Diffstat (limited to 'system')
-rw-r--r--system/helpers/date_helper.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php
index 065a223ef..cafb6ba95 100644
--- a/system/helpers/date_helper.php
+++ b/system/helpers/date_helper.php
@@ -304,13 +304,13 @@ if ( ! function_exists('local_to_gmt'))
$time = time();
}
- return gmmktime(
- date('G', $time),
- date('i', $time),
- date('s', $time),
- date('n', $time),
- date('j', $time),
- date('Y', $time)
+ return mktime(
+ gmdate('G', $time),
+ gmdate('i', $time),
+ gmdate('s', $time),
+ gmdate('n', $time),
+ gmdate('j', $time),
+ gmdate('Y', $time)
);
}
}