| @@ -183,32 +183,28 @@ | ||
| 183 | 183 | break; |
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | // Arguments for fetching closed tickets to be archived. |
| 187 | - $args = array( | |
| 187 | + $filters = array( | |
| 188 | 188 | 'items_per_page' => 20, |
| 189 | 189 | 'orderby' => 'date_closed', |
| 190 | 190 | 'order' => 'ASC', |
| 191 | - ); | |
| 192 | - | |
| 193 | - // Add closed status condition in arguments. | |
| 194 | - $filters = array( 'relation' => 'AND' ); | |
| 195 | - $filters[] = array( | |
| 196 | - array( | |
| 197 | - 'slug' => 'status', | |
| 198 | - 'compare' => 'IN', | |
| 199 | - 'val' => $ad_settings['closed-ticket-statuses'], | |
| 191 | + 'meta_query' => array( | |
| 192 | + 'relation' => 'AND', | |
| 193 | + array( | |
| 194 | + 'slug' => 'status', | |
| 195 | + 'compare' => 'IN', | |
| 196 | + 'val' => $ad_settings['closed-ticket-statuses'], | |
| 197 | + ), | |
| 198 | + array( | |
| 199 | + 'slug' => 'date_closed', | |
| 200 | + 'compare' => '<', | |
| 201 | + 'val' => $age->format( 'Y-m-d' ), | |
| 202 | + ), | |
| 200 | 203 | ), |
| 201 | - array( | |
| 202 | - 'slug' => 'date_closed', | |
| 203 | - 'compare' => '<', | |
| 204 | - 'val' => $age->format( 'Y-m-d' ), | |
| 205 | - ), | |
| 206 | 204 | ); |
| 207 | 205 | |
| 208 | - $filters = array_merge( $args, array( 'meta_query' => $filters ) ); | |
| 209 | 206 | $filters = apply_filters( 'wpsc_auto_archive_closed_tickets_query', $filters ); |
| 210 | - | |
| 211 | 207 | // Get tickets to be archive. |
| 212 | 208 | $tickets = WPSC_Ticket::find( $filters ); |
| 213 | 209 | |
| 214 | 210 | // Archive tickets. |