summaryrefslogtreecommitdiffstats
path: root/system/helpers
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-02-20 14:46:05 +0100
committerAndrey Andreev <narf@devilix.net>2014-02-20 14:46:05 +0100
commitbe368a82f789aaa9f0ac0c8b6fa72a2f7cd0b6d4 (patch)
tree43a29bbea1b145cf92ada0efe49f19b8fcbcd273 /system/helpers
parentca39f2efb2d827d13e4065535355de894965435a (diff)
Date helper days_in_month(), CI_Calendar::get_total_days() changes
- days_in_month() now uses cal_days_in_month(), if available. - CI_Calendar::get_total_days() is now an alias for days_in_month().
Diffstat (limited to 'system/helpers')
-rw-r--r--system/helpers/date_helper.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php
index 56e5c46aa..73fd8086e 100644
--- a/system/helpers/date_helper.php
+++ b/system/helpers/date_helper.php
@@ -278,6 +278,11 @@ if ( ! function_exists('days_in_month'))
$year = date('Y');
}
+ if (defined('CAL_GREGORIAN'))
+ {
+ return cal_days_in_month(CAL_GREGORIAN, $month, $year);
+ }
+
if ($year >= 1970)
{
return (int) date('t', mktime(12, 0, 0, $month, 1, $year));