Skip to content

Commit 6e8332e

Browse files
committed
Fix logic in applyFilter
1 parent 89c0b78 commit 6e8332e

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

src/QueryTemplate.php

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -140,22 +140,20 @@ protected function applyFilter(string $hookName, string $value, ?WP_Query $query
140140
}
141141

142142
// Handle custom queries.
143-
if ($wp_query instanceof WP_Query && $wp_the_query instanceof WP_Query) {
144-
$customQueryBackup = $wp_query;
145-
$customTheQueryBackup = $wp_the_query;
146-
// Overwrite main query globals.
147-
$wp_query = $query;
148-
$wp_the_query = $query;
149-
150-
$filteredValue = apply_filters($hookName, $value);
151-
if (is_string($filteredValue)) {
152-
$value = $filteredValue;
153-
}
154-
155-
$wp_query = $customQueryBackup;
156-
$wp_the_query = $customTheQueryBackup;
143+
$customQueryBackup = $wp_query;
144+
$customTheQueryBackup = $wp_the_query;
145+
// Overwrite main query globals.
146+
$wp_query = $query;
147+
$wp_the_query = $query;
148+
149+
$filteredValue = apply_filters($hookName, $value);
150+
if (is_string($filteredValue)) {
151+
$value = $filteredValue;
157152
}
158153

154+
$wp_query = $customQueryBackup;
155+
$wp_the_query = $customTheQueryBackup;
156+
159157
return $value;
160158
}
161159
}

0 commit comments

Comments
 (0)