Skip to content

Fix check for empty dependencies on admin bar style loader tag filter #7920

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

Open
Takshil-Kunadia wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Fix check for empty dependencies on admin bar style loader tag filter #7920

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a27f07f
Add check for empty dependencies
Takshil-Kunadia Nov 13, 2024
52fc462
rorganise code
Takshil-Kunadia Nov 14, 2024
79b1b7a
Update test
Takshil-Kunadia Nov 14, 2024
5f17b90
refactor similar functions & test
Takshil-Kunadia Nov 15, 2024
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 includes/class-amp-theme-support.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1379,7 +1379,7 @@ protected static function is_exclusively_dependent( WP_Dependencies $dependencie
*/
public static function filter_admin_bar_style_loader_tag( $tag, $handle ) {
if (
is_array( wp_styles()->registered['admin-bar']->deps ) && in_array( $handle, wp_styles()->registered['admin-bar']->deps, true ) ?
! empty( wp_styles()->registered['admin-bar']->deps ) && is_array( wp_styles()->registered['admin-bar']->deps ) && in_array( $handle, wp_styles()->registered['admin-bar']->deps, true ) ?
self::is_exclusively_dependent( wp_styles(), $handle, 'admin-bar' ) :
self::has_dependency( wp_styles(), $handle, 'admin-bar' )
Comment on lines 1381 to 1388
Copy link
Copy Markdown
Member

@westonruter westonruter Nov 13, 2024

Choose a reason for hiding this comment

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

Alternatively:

		$admin_bar_dep = wp_styles()->query( 'admin-bar', 'registered' );
		if (
			$admin_bar_dep && in_array( $handle, $admin_bar_dep->deps, true ) ?
				self::is_exclusively_dependent( wp_styles(), $handle, 'admin-bar' ) :
				self::has_dependency( wp_styles(), $handle, 'admin-bar' )

Copy link
Copy Markdown
Contributor Author

@Takshil-Kunadia Takshil-Kunadia Nov 14, 2024

Choose a reason for hiding this comment

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

yes, much better.

Copy link
Copy Markdown
Contributor Author

@Takshil-Kunadia Takshil-Kunadia Nov 14, 2024

Choose a reason for hiding this comment

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

Also we don't need to pass status param in query() as the default value is 'registered'.

) {
Expand Down