Allow opting-out of AMP-to-AMP links, ensure 'Exit Reader Mode' link is non-AMP #4146
Commits on Jan 21, 2020
-
Allow opting-out of AMP-to-AMP links with rel=not-amphtml
As Weston suggested, this forces links to non-AMP.
-
Ensure the 'Exit Reader Mode' link goes to non-AMP
Even if add_filter( 'amp_to_amp_linking_enabled', '__return_true' ); is present, this should still go to non-AMP.
-
Add a filter to opt-out of AMP-to-AMP links
When in Reader or Transitional mode, links to the same origin will usually be to AMP. But this filter enables passing URLs that will link to non-AMP, not AMP.
-
Simplify a conditional to use an elseif block
The if block only ran if the previous block didn't, so an elseif block probably makes sense here.
-
Add some comments in unit test
It's not very clear what these are testing without the comments.
-
Remove needless variable, move into conditional
There's no need to store this in a variable, So simply move the boolean to the conditional.
-
Rename filter amp_to_amp_excluded_links
This is clearer that it's in the AMP plugin, as the beginning serves as a sort of prefix.
-
Handle cases of multpile rel values, using Weston's snippets
The rel attribute can have multiple space-separated values: https://developer.mozilla.org/en-US/docs/Web/HTML/Link_types
-
Update includes/sanitizers/class-amp-link-sanitizer.php
Commit Weston's suggestion Co-Authored-By: Weston Ruter <[email protected]>
-
Address failed Travis build: PHPCS array_search() warning
Pass a 3rd argument of true to array_search() so that Travis passes.
Commits on Jan 22, 2020
-
Update unit tests for new rel value
Now that it's changed to noamphtml, update this in the unit tests also.
Commits on Jan 23, 2020
-
Commit Weston's suggestion for the Reader mode template
The rel value was changed to noamphtml, so it should be reflected here also. Co-Authored-By: Weston Ruter <[email protected]>
-
Change DocBlock of 'amp_to_amp_excluded_links'
Using Weston's suggestion in the pull request.
-
Change filter name to 'amp_to_amp_excluded_urls'
As Weston pointed out, this is filtering URLs.
-
Rename parameter 'excluded_amp_links' to 'excluded_urls'
These are not really links, they're URLs.
-
Handle case of something like #heading at end of URL
As Weston mentioned, this shouldn't be used in comparison.
-
Commit Weston's suggestion to prevent conditional in Standard mode
Co-Authored-By: Weston Ruter <[email protected]>
-
Add a since tag to the new filter amp_to_amp_excluded_urls
As Weston mentioned, this didn't have one.
-
-
Fix some phpcs errors, mainly => alignment
Do npm run lint:php:fix to fix some of these.