asc/sportspress
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix previous-current-week calendar filtering

Browse Source
This commit is contained in:
savvasha
2018-11-20 17:30:34 +02:00
parent 6db71e256f
commit 2c250ace18
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
includes/class-sp-calendar.php
View File

@@ -191,8 +191,8 @@ class SP_Calendar extends SP_Secondary_Post {
$after = date_i18n('Y-m-d', strtotime("$firstday -2 week")); $after = date_i18n('Y-m-d', strtotime("$firstday -2 week"));
$before = date_i18n('Y-m-d', strtotime("$lastday last week")).' 23:59:59'; $before = date_i18n('Y-m-d', strtotime("$lastday last week")).' 23:59:59';
}else{ }else{
$after = date_i18n('Y-m-d', strtotime("$firstday last week")); $after = date_i18n('Y-m-d', strtotime("$firstday -2 week"));
$before = date_i18n('Y-m-d', strtotime("$lastday this week")).' 23:59:59'; $before = date_i18n('Y-m-d', strtotime("$lastday last week")).' 23:59:59';
} }
$args['date_query'] = array( $args['date_query'] = array(
array( array(
@@ -217,9 +217,10 @@ class SP_Calendar extends SP_Secondary_Post {
$after = date_i18n('Y-m-d', strtotime("$firstday last week")); $after = date_i18n('Y-m-d', strtotime("$firstday last week"));
$before = date_i18n('Y-m-d', strtotime("$lastday this week")).' 23:59:59'; $before = date_i18n('Y-m-d', strtotime("$lastday this week")).' 23:59:59';
}else{ }else{
$after = date_i18n('Y-m-d', strtotime("$firstday this week")); $after = date_i18n('Y-m-d', strtotime("$firstday last week"));
$before = date_i18n('Y-m-d', strtotime("$lastday next week")).' 23:59:59'; $before = date_i18n('Y-m-d', strtotime("$lastday this week")).' 23:59:59';
} }
$args['date_query'] = array( $args['date_query'] = array(
array( array(
'after' => $after, 'after' => $after,
@@ -241,7 +242,7 @@ class SP_Calendar extends SP_Secondary_Post {
$after = date_i18n('Y-m-d', strtotime("$firstday this week")); $after = date_i18n('Y-m-d', strtotime("$firstday this week"));
$before = date_i18n('Y-m-d', strtotime("$lastday next week")).' 23:59:59'; $before = date_i18n('Y-m-d', strtotime("$lastday next week")).' 23:59:59';
}else{ }else{
$after = date_i18n('Y-m-d', strtotime("$firstday next week")); $after = date_i18n('Y-m-d', strtotime("$firstday this week"));
$before = date_i18n('Y-m-d', strtotime("$lastday +1 week")).' 23:59:59'; $before = date_i18n('Y-m-d', strtotime("$lastday +1 week")).' 23:59:59';
} }
$args['date_query'] = array( $args['date_query'] = array(