In #3321 it was discovered that rejecting the sanitization of a validation error on an AMP Story results in an infinite redirect when a site is not in Standard mode. When processing a Story, it should behave as if the site is in Standard mode. No redirection should be performed when there are rejected validation errors, but rather the amp attribute should be removed from the page to prevent it from being validated as a valid AMP page.

In the same way, when a Story is listed among the Validated URLs in the admin, there should be no ?amp appearing in the displayed URLs.

Testing instructions:

1. Set mode to Transitional.
2. Create a Story and add a Custom HTML block with some invalid AMP markup, like <script>bad</script>
3. Publish Story.
4. A warning message should appear about validation errors. Click “Review Issues”.
5. With this ifx applied, the Validated URL screen should not show ?amp in the heading.
6. On the Validated URL screen, set the validation error status as “Rejected” instead of “New Accepted”. Press Update.
7. Try navigating to the permalink of the post, and the Story should render but not as a valid AMP page; the Custom HTML markup should appear in the page, and the html element should have the amp attribute omitted.

Before

Viewing the story:

After

Viewing the story: