Index: branches/5.3.x/core/units/admin/admin_tag_processor.php =================================================================== diff -u -N -r15914 -r15928 --- branches/5.3.x/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 15914) +++ branches/5.3.x/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 15928) @@ -1,6 +1,6 @@ Application->ConfigValue('FirstDayOfWeek'); if ( $fdow && $w == 0 ) { $w = 7; } - $today_start = adodb_mktime(0, 0, 0, adodb_date('m'), adodb_date('d'), $y); + + $today_start = mktime(0, 0, 0, date('m'), date('d'), $y); $first_day_of_this_week = $today_start - ($w - $fdow) * 86400; - $first_day_of_this_month = adodb_mktime(0, 0, 0, $m, 1, $y); + $first_day_of_this_month = mktime(0, 0, 0, $m, 1, $y); $this_quater = ceil($m / 3); - $this_quater_start = adodb_mktime(0, 0, 0, $this_quater * 3 - 2, 1, $y); + $this_quater_start = mktime(0, 0, 0, $this_quater * 3 - 2, 1, $y); switch ( $params['type'] ) { case 'last_week_start': @@ -535,31 +536,31 @@ break; case 'last_month_start': - $timestamp = $m == 1 ? adodb_mktime(0, 0, 0, 12, 1, $y - 1) : adodb_mktime(0, 0, 0, $m - 1, 1, $y); + $timestamp = $m == 1 ? mktime(0, 0, 0, 12, 1, $y - 1) : mktime(0, 0, 0, $m - 1, 1, $y); break; case 'last_month_end': - $timestamp = $first_day_of_this_month = adodb_mktime(0, 0, 0, $m, 1, $y) - 1; + $timestamp = $first_day_of_this_month = mktime(0, 0, 0, $m, 1, $y) - 1; break; case 'last_quater_start': - $timestamp = $this_quater == 1 ? adodb_mktime(0, 0, 0, 10, 1, $y - 1) : adodb_mktime(0, 0, 0, ($this_quater - 1) * 3 - 2, 1, $y); + $timestamp = $this_quater == 1 ? mktime(0, 0, 0, 10, 1, $y - 1) : mktime(0, 0, 0, ($this_quater - 1) * 3 - 2, 1, $y); break; case 'last_quater_end': $timestamp = $this_quater_start - 1; break; case 'last_6_months_start': - $timestamp = $m <= 6 ? adodb_mktime(0, 0, 0, $m + 6, 1, $y - 1) : adodb_mktime(0, 0, 0, $m - 6, 1, $y); + $timestamp = $m <= 6 ? mktime(0, 0, 0, $m + 6, 1, $y - 1) : mktime(0, 0, 0, $m - 6, 1, $y); break; case 'last_year_start': - $timestamp = adodb_mktime(0, 0, 0, 1, 1, $y - 1); + $timestamp = mktime(0, 0, 0, 1, 1, $y - 1); break; case 'last_year_end': - $timestamp = adodb_mktime(23, 59, 59, 12, 31, $y - 1); + $timestamp = mktime(23, 59, 59, 12, 31, $y - 1); break; default: @@ -577,7 +578,7 @@ $format = $lang->GetDBField($regs[1]); } - return adodb_date($format, $timestamp); + return date($format, $timestamp); } return $timestamp;