Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Search: fix search product supporting determination #22519

Merged
merged 2 commits into from
Jan 27, 2022
Merged

Search: fix search product supporting determination #22519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2875e66
fix compability with old activation process
kangzj Jan 27, 2022
9fb2bab
changelog
kangzj Jan 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions projects/packages/search/changelog/fix-supports-search-compatibility
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fixed

Search package: fixed compatibility issue with plan activation
4 changes: 2 additions & 2 deletions projects/packages/search/src/class-plan.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,15 @@ public function has_jetpack_search_product() {
*/
public function supports_instant_search() {
$plan_info = $this->get_plan_info();
return isset( $plan_info['supports_instant_search'] ) && $plan_info['supports_instant_search'];
return ( isset( $plan_info['supports_instant_search'] ) && $plan_info['supports_instant_search'] ) || $this->has_jetpack_search_product();
}

/**
* Returns true if the plan support either Instant Search or Classic Search.
*/
public function supports_search() {
$plan_info = $this->get_plan_info();
return isset( $plan_info['supports_search'] ) && $plan_info['supports_search'];
return ( isset( $plan_info['supports_search'] ) && $plan_info['supports_search'] ) || $this->has_jetpack_search_product();
}

/**
Expand Down