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.

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

(CANTINA-949) Jetpack: Move pre_option_jetpack_active_plan around to run before JP loads #4909

Merged
merged 2 commits into from
Sep 29, 2023

Conversation

rebeccahum
Copy link
Contributor

@rebeccahum rebeccahum commented Sep 28, 2023

Description

Fixes the issue of modules being deactivated by check_plan_deactivate_modules(). Also, removes Jetpack::is_active() check in the option filtering since it calls get_userdata() which isn't available at that point of code execution.

Changelog Description

Plugin Updated: VIP Jetpack

Fixes the issue of modules being deactivated by check_plan_deactivate_modules().

Pre-review checklist

Please make sure the items below have been covered before requesting a review:

  • This change works and has been tested locally (or has an appropriate fallback).
  • This change works and has been tested on a Go sandbox.
  • This change has relevant unit tests (if applicable).
  • This change uses a rollout method to ease with deployment (if applicable - especially for large scale actions that require writes).
  • This change has relevant documentation additions / updates (if applicable).
  • I've created a changelog description that aligns with the provided examples.

Pre-deploy checklist

  • VIP staff: Ensure any alerts added/updated conform to internal standards (see internal documentation).

Steps to Test

To reproduce issue:

  1. wp jetpack module activate google-analytics
  2. wp jetpack module list and verify google-analytics module is activated
  3. Go to wp-admin > Jetpack > Dashboard and then run step 2) and see that it gets deactivated.

This patch should fix that.

@rebeccahum rebeccahum added the [Component] Jetpack ChangelogTagID: 636069 label Sep 28, 2023
@rebeccahum rebeccahum marked this pull request as ready for review September 28, 2023 21:02
@rebeccahum rebeccahum requested a review from a team as a code owner September 28, 2023 21:02
@codecov
Copy link

codecov bot commented Sep 28, 2023

Codecov Report

Merging #4909 (2c40b5c) into develop (8de9938) will not change coverage.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##             develop    #4909   +/-   ##
==========================================
  Coverage      29.20%   29.20%           
  Complexity      4726     4726           
==========================================
  Files            277      277           
  Lines          20830    20830           
==========================================
  Hits            6083     6083           
  Misses         14747    14747           
Files Coverage Δ
vip-jetpack/vip-jetpack.php 24.81% <ø> (+18.22%) ⬆️
jetpack.php 3.69% <0.00%> (-14.79%) ⬇️

Copy link
Contributor

@WPprodigy WPprodigy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested various connection states and flows, all still works well. Thanks!

@rebeccahum rebeccahum merged commit f7a70b1 into develop Sep 29, 2023
40 of 41 checks passed
@rebeccahum rebeccahum deleted the jp/move_filter_up branch September 29, 2023 20:29
andrea-sdl pushed a commit that referenced this pull request Oct 19, 2023
…run before JP loads (#4909)

* Jetpack: Move pre_option_jetpack_active_plan around to run before Jetpack loads

* Remove unnecessary `VIP_JETPACK_SKIP_LOAD` constant check
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants