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

Utility function for checking if a request should be integrated. #2267

Merged
merged 11 commits into from
Aug 23, 2021
Merged

Utility function for checking if a request should be integrated. #2267

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1726bcd
Utility function for checking if a request should be integrated. Addr…
JakePT Jul 14, 2021
7132b44
Support request types in integration conditional function.
JakePT Jul 20, 2021
d6d6e17
Correct variables.
JakePT Jul 20, 2021
873bea3
Pass context to integrated request function.
JakePT Aug 16, 2021
7d4cd02
Fix variable name.
JakePT Aug 18, 2021
c8f7b1a
Merge branch 'develop' into fix/2148
JakePT Aug 23, 2021
7d6acd8
Merge branch 'develop' into fix/2148
JakePT Aug 23, 2021
378cdcc
Merge branch 'fix/2148' of github.com:10up/ElasticPress into fix/2148
JakePT Aug 23, 2021
ec749b5
Add missing use statement.
JakePT Aug 23, 2021
189bdca
Tests: reset current_screen
felipeelia Aug 23, 2021
e708504
Merge branch 'develop' into fix/2148
felipeelia Aug 23, 2021
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
Prev Previous commit
Next Next commit
Merge branch 'develop' into fix/2148
  • Loading branch information
@JakePT
JakePT committed Aug 23, 2021
commit 7d6acd85e5c797c1f5c0504e82122bbc688343b8
9 changes: 9 additions & 0 deletions includes/classes/Feature/ProtectedContent/ProtectedContent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ public function setup() {
add_filter( 'ep_indexable_post_types', [ $this, 'post_types' ], 10, 1 );
add_filter( 'ep_admin_wp_query_integration', '__return_true' );
add_action( 'pre_get_posts', [ $this, 'integrate' ] );

if ( Features::factory()->get_registered_feature( 'comments' )->is_active() ) {
add_filter( 'ep_indexable_comment_status', [ $this, 'get_comment_statuses' ] );
add_action( 'pre_get_comments', [ $this, 'integrate_comments_query' ] );
}
}

/**
Expand Down Expand Up @@ -182,6 +187,10 @@ public function integrate( $query ) {
* @since 3.6.0
*/
public function integrate_comments_query( $comment_query ) {
if ( ! Utils\is_integrated_request( $this->slug, [ 'admin' ] ) ) {
return;
}

// Lets make sure this doesn't interfere with the CLI
if ( defined( 'WP_CLI' ) && WP_CLI ) {
return;
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.