Remove unnecessary has_filter() calls
#414
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aristath
commented
Dec 11, 2023
Comment on lines
-1659
to
+1657
| $simplified_summary_heading = 'Simplified Summary'; | ||
|
|
||
| // filter title. | ||
| if ( has_filter( 'edac_filter_simplified_summary_heading' ) ) { | ||
| $simplified_summary_heading = apply_filters( 'edac_filter_simplified_summary_heading', $simplified_summary_heading ); | ||
| } | ||
| $simplified_summary_heading = apply_filters( | ||
| 'edac_filter_simplified_summary_heading', | ||
| esc_html__( 'Simplified Summary', 'accessibility-checker' ) | ||
| ); |
There was a problem hiding this comment.
Also made the text translatable
aristath
commented
Dec 11, 2023
Comment on lines
-327
to
+338
| $notice = 'Whoops! It looks like your website is currently password protected. The free version of Accessibility Checker can only scan live websites. To scan this website for accessibility problems either remove the password protection or <a href="https://equalizedigital.com/accessibility-checker/pricing/" target="_blank" aria-label="upgrade to accessibility checker pro, opens in a new window">upgrade to pro</a>. Scan results may be stored from a previous scan.'; | ||
|
|
||
| if ( has_filter( 'edac_filter_password_protected_notice_text' ) ) { | ||
| $notice = apply_filters( 'edac_filter_password_protected_notice_text', $notice ); | ||
| } | ||
|
|
||
| return $notice; | ||
| return apply_filters( | ||
| 'edac_filter_password_protected_notice_text', | ||
| sprintf( | ||
| // translators: %s is the link to upgrade to pro, with "upgrade to pro" as the anchor text. | ||
| esc_html__( 'Whoops! It looks like your website is currently password protected. The free version of Accessibility Checker can only scan live websites. To scan this website for accessibility problems either remove the password protection or %s. Scan results may be stored from a previous scan.', 'accessibility-checker' ), | ||
| sprintf( | ||
| '<a href="https://equalizedigital.com/accessibility-checker/pricing/" target="_blank" aria-label="%1$s">%2$s</a>', | ||
| esc_attr__( 'Upgrade to accessibility checker pro. Opens in a new window.', 'accessibility-checker' ), | ||
| esc_html__( 'upgrade to pro', 'accessibility-checker' ) | ||
| ) | ||
| ) | ||
| ); |
There was a problem hiding this comment.
Also made sure the text for this notice is translatable and properly escaped.
aristath
commented
Dec 11, 2023
| if ( has_filter( 'replace_editor', 'gutenberg_init' ) ) { | ||
| // Gutenberg is installed and activated. | ||
| $gutenberg = true; | ||
| } | ||
| $gutenberg = has_filter( 'replace_editor', 'gutenberg_init' ); |
There was a problem hiding this comment.
Ideally we'd check if Gutenberg is active using a check like the one below:
$gutenberg = defined( 'IS_GUTENBERG_PLUGIN' );That's something we can do in a followup PR when we rething a bit how we check for plugins 👍
SteveJonesDev
approved these changes
Dec 12, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There's no need to check if
has_filterbefore applying filters.This PR removes the cases where
has_filter()was not required.