Skip to content

Commit ad6c87f

Browse files
committed
Improve export logic over dates
1 parent ac3fa5d commit ad6c87f

1 file changed

Lines changed: 22 additions & 3 deletions

File tree

src/Features/SingleExport/SaltusSingleExport.php

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,14 +289,33 @@ private function is_fake_date_export_query( \WP_Query $query ): bool {
289289
}
290290

291291
$date_query = $query->get( 'date_query' );
292-
if ( empty( $date_query[0]['after'] ) || empty( $date_query[0]['before'] ) ) {
292+
if ( ! is_array( $date_query ) ) {
293+
return false;
294+
}
295+
296+
$after = null;
297+
$before = null;
298+
299+
foreach ( $date_query as $clause ) {
300+
if ( ! is_array( $clause ) ) {
301+
continue;
302+
}
303+
if ( isset( $clause['after'] ) ) {
304+
$after = $clause['after'];
305+
}
306+
if ( isset( $clause['before'] ) ) {
307+
$before = $clause['before'];
308+
}
309+
}
310+
311+
if ( empty( $after ) || empty( $before ) ) {
293312
return false;
294313
}
295314

296315
$start = gmdate( 'Y-m-d', strtotime( self::FAKE_DATE ) );
297316
$end = gmdate( 'Y-m-d', strtotime( '+1 month', strtotime( self::FAKE_DATE ) ) );
298317

299-
return gmdate( 'Y-m-d', strtotime( $date_query[0]['after'] ) ) === $start
300-
&& gmdate( 'Y-m-d', strtotime( $date_query[0]['before'] ) ) === $end;
318+
return gmdate( 'Y-m-d', strtotime( $after ) ) === $start
319+
&& gmdate( 'Y-m-d', strtotime( $before ) ) === $end;
301320
}
302321
}

0 commit comments

Comments
 (0)