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

Jump to bottom

Calypsoify: fix Masterbar reference after its refactor #17939

Merged
merged 2 commits into from
Dec 3, 2020
Merged

Calypsoify: fix Masterbar reference after its refactor #17939

merged 2 commits into from
Dec 3, 2020

Conversation

jeherve
Copy link
Member

@jeherve jeherve commented Dec 1, 2020 •
edited
Loading

Changes proposed in this Pull Request:

Jetpack product discussion

  • p1606836053244800-slack-C02C4GXMY

Does this pull request change what data or activity we track or use?

  • No

Testing instructions:

  • Start from a fresh Jetpack site running this branch.
  • Go to Jetpack > Settings and enable SSO.
  • Go to https://wordpress.com/posts/yoursite.com
  • Click on the button to start writing a new post.
  • You should not see any Fatal errors

Proposed changelog entry for your changes:

  • WordPress.com Toolbar: avoid Fatal errors when the feature is not active.

@jeherve jeherve added [Type] Bug When a feature is broken and / or not performing as intended [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. [Pri] High [Feature] Masterbar WordPress.com Toolbar and Dashboard customizations [Feature] Calypsoify labels Dec 1, 2020
@jeherve jeherve added this to the 9.2.1 milestone Dec 1, 2020
@jeherve jeherve self-assigned this Dec 1, 2020
@jetpackbot
Copy link

jetpackbot commented Dec 1, 2020 •
edited
Loading

Scheduled Jetpack release: January 12, 2021.
Scheduled code freeze: January 4, 2021

Thank you for the great PR description!

When this PR is ready for review, please apply the [Status] Needs Review label. If you are an a11n, please have someone from your team review the code if possible. The Jetpack team will also review this PR and merge it to be included in the next Jetpack release.

Generated by 🚫 dangerJS against c236015

anomiex
anomiex previously approved these changes Dec 1, 2020
View reviewed changes
kraftbj added a commit that referenced this pull request Dec 1, 2020
@kraftbj
Add test for #17939 bug
b4412c2
@kraftbj kraftbj mentioned this pull request Dec 1, 2020
Merged
jeherve added a commit to Automattic/wp-calypso that referenced this pull request Dec 1, 2020
@jeherve
Calypso editor: do not set Calypsoify on Jetpack 9.2
df71e18 
Calypsoify is currently broken in Jetpack 9.2:
Automattic/jetpack#17939

Until a point release is available, this may avoid creating Fatal errors on sites that do not have Calypsoify enabled yet.
@jeherve jeherve mentioned this pull request Dec 1, 2020
Merged
@kraftbj kraftbj mentioned this pull request Dec 1, 2020
Merged
kraftbj
kraftbj previously approved these changes Dec 2, 2020
View reviewed changes
jeherve and others added 2 commits December 3, 2020 12:54
@jeherve
Calypsoify: fix Masterbar reference after its refactor
be06727 
In #17762 and #17783 we've refactored the Masterbar, but forgot to update references to it in the Calypsoify feature, thus causing Fatal errors.
@kraftbj @jeherve
Calypsoify: Add test to fail under 9.2 (#17942)
c236015
@jeherve jeherve force-pushed the fix/fatal-calypsoify-masterbar branch from b6dba82 to c236015 Compare December 3, 2020 11:55
@jeherve
Copy link
Member Author

jeherve commented Dec 3, 2020

I rebased as the tests seem all over the place. This should be good for a final review now.

@kraftbj kraftbj added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. labels Dec 3, 2020
@jeherve jeherve merged commit 8634e49 into master Dec 3, 2020
@jeherve jeherve deleted the fix/fatal-calypsoify-masterbar branch December 3, 2020 12:10
@matticbot matticbot added [Status] Needs Changelog and removed [Status] Ready to Merge Go ahead, you can push that green button! labels Dec 3, 2020
jeherve added a commit that referenced this pull request Dec 3, 2020
@jeherve @kraftbj
[not verified] Calypsoify: fix Masterbar reference after its refactor (…
b8a8cbf 
…#17939)

Co-authored-by: Brandon Kraft <public@brandonkraft.com>
@jeherve
Copy link
Member Author

jeherve commented Dec 3, 2020

Cherry-picked to branch-9.2 in b8a8cbf

@JoshuaGoode
Copy link
Contributor

Noting that this can also impact WordPress.com on Atomic sites. Encountered this fatal on a site using a code snippet to disable the WPCOM masterbar.

Internal discussion:
p1607028809083300-slack-C03AP0WBV

@JoshuaGoode JoshuaGoode mentioned this pull request Dec 5, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kraftbj kraftbj kraftbj approved these changes

@anomiex anomiex anomiex left review comments

Assignees

@jeherve jeherve

Labels
[Feature] Calypsoify [Feature] Masterbar WordPress.com Toolbar and Dashboard customizations [Pri] High [Type] Bug When a feature is broken and / or not performing as intended
Projects
None yet
Milestone
9.2.1
Development

Successfully merging this pull request may close these issues.
6 participants
@jeherve @jetpackbot @JoshuaGoode @kraftbj @anomiex @matticbot