-
Notifications
You must be signed in to change notification settings - Fork 801
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
Untangle: Enable user data fields & color scheme selector #35271
Conversation
Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.
Interested in more tips and information?
|
Thank you for your PR! When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:
This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖 The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available. Once your PR is ready for review, check one last time that all required checks appearing at the bottom of this PR are passing or skipped. Jetpack plugin: The Jetpack plugin has different release cadences depending on the platform:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Debug Helper plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Backup plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Boost plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Search plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Social plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Starter Plugin plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Protect plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Videopress plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Super Cache plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Migration plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Mu Wpcom plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Inspect plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After exploring the codebase a bit more, I think the whole logic is self-contained in this file:
projects/plugins/jetpack/modules/masterbar/profile-edit/bootstrap.php
What if, we just don't include that file when the classic style is enabled? So the change is simply:
diff --git a/projects/plugins/jetpack/modules/masterbar.php b/projects/plugins/jetpack/modules/masterbar.php
index aacde02a96..e61fa14b49 100644
--- a/projects/plugins/jetpack/modules/masterbar.php
+++ b/projects/plugins/jetpack/modules/masterbar.php
@@ -28,7 +28,11 @@ new Admin_Color_Schemes();
if ( ( new Host() )->is_woa_site() ) {
new Inline_Help();
require_once __DIR__ . '/masterbar/wp-posts-list/bootstrap.php';
- require_once __DIR__ . '/masterbar/profile-edit/bootstrap.php';
+
+ if ( get_option( 'wpcom_admin_interface' ) !== 'wp-admin' ) {
+ require_once __DIR__ . '/masterbar/profile-edit/bootstrap.php';
+ }
+
require_once __DIR__ . '/masterbar/nudges/bootstrap.php';
}
(Haven't tested it, though.)
Interesting, I'll take a look and test if everything works as expected. Thanks! |
@fushar, I updated with your suggestion and it works great, thanks for that 🎉 |
projects/plugins/jetpack/modules/masterbar/masterbar/class-masterbar.php
Show resolved
Hide resolved
072ca1a
to
136c7d7
Compare
4c7d3f3
to
14eddb2
Compare
136c7d7
to
c536df9
Compare
96c1e86
to
0a9c305
Compare
Closed in favor of #36341 |
Follow-up: #35235
Proposed changes:
Removes all wpcom related data from Profile and make the Admin Color Schema work when enable it by using this PR: https://github.com/Automattic/wpcomsh/pull/1669
Jetpack product discussion
paYJgx-4uN-p2#comment-4524
Does this pull request change what data or activity we track or use?
No
Testing instructions:
Admin interface style
toClassic (wp-admin)
inwordpress.com/hosting-config/site_slug
wp-admin
Users
>Profile
should link to wp-admin profile page