Skip to content

Fix AMP integration by deferring masterbar setup to wp action #11088

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

Merged
merged 2 commits into from
Jan 8, 2019
Merged

Fix AMP integration by deferring masterbar setup to wp action #11088

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6518ba2
Fix AMP integration by deferring masterbar setup to wp action
westonruter Jan 4, 2019
a4caf27
Initialize masterbar at admin_bar_init action instead of wp for compa…
jeherve Jan 7, 2019
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
2 changes: 1 addition & 1 deletion modules/masterbar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
require dirname( __FILE__ ) . '/masterbar/masterbar.php';

// In order to be able to tell if it's an AMP request or not we have to hook into parse_query at a later priority.
add_action( 'parse_query', 'jetpack_initialize_masterbar', 99 );
add_action( 'admin_bar_init', 'jetpack_initialize_masterbar', 99 );

/**
* Initializes the Masterbar in case the request is not AMP.
Expand Down