Jetpack: Add subscription management link to already subscribed error#9093
Merged
dereksmart merged 4 commits intomasterfrom Mar 27, 2018
Merged
Jetpack: Add subscription management link to already subscribed error#9093dereksmart merged 4 commits intomasterfrom
dereksmart merged 4 commits intomasterfrom
Conversation
…n user attempts to subscribe again
roccotripaldi
suggested changes
Mar 20, 2018
Contributor
roccotripaldi
left a comment
There was a problem hiding this comment.
Quick spacing fix, but other than that, this code is solid. Testing now.
modules/subscriptions.php
Outdated
| case 'already' : ?> | ||
| <p class="error"><?php esc_html_e( 'You have already subscribed to this site. Please check your inbox.', 'jetpack' ); ?></p> | ||
| <?php break; | ||
| <p class="error"><?php printf( __( 'You have already subscribed to this site. Please check your inbox. <br /> You can manage your preferences at <a href="%1$s" title="%2$s" target="_blank">subscribe.wordpress.com</a>', 'jetpack' ), |
Contributor
There was a problem hiding this comment.
Spacing seems off a bit. May need an other tab or 2
roccotripaldi
approved these changes
Mar 20, 2018
Contributor
roccotripaldi
left a comment
There was a problem hiding this comment.
Thanks for the fix @gititon - works as expected, and makes this flow less confusing.
simison
reviewed
Mar 20, 2018
| <p class="error"><?php esc_html_e( 'You have already subscribed to this site. Please check your inbox.', 'jetpack' ); ?></p> | ||
| <?php break; | ||
| <p class="error"><?php printf( __( 'You have already subscribed to this site. Please check your inbox. <br /> You can manage your preferences at <a href="%1$s" title="%2$s" target="_blank">subscribe.wordpress.com</a>', 'jetpack' ), | ||
| 'https://subscribe.wordpress.com/', |
Member
There was a problem hiding this comment.
Remember to add rel="noopener noreferrer" in external links with target="_blank" as a security precaution. More info: https://mathiasbynens.github.io/rel-noopener/
dereksmart
added a commit
that referenced
this pull request
Mar 27, 2018
dereksmart
pushed a commit
that referenced
this pull request
Mar 27, 2018
* Changelog 6.0: create base for changelog. * Add #8938 to changelog * Add #8962 to changelog * Add #8974 to changelog * Add #8975 to changelog * Add #8978 to changelog * Add #8867 to changelog * Add #8937 to changelog * Add #8961 to changelog * Add #8855 to changelog * Add #8944 to changelog * Add #8973 to changelog * Add #8977 to changelog * Add #8979 to changelog * Add #8980 to changelog * Add #8982 to changelog * Add #8983 to changelog * Add #8984 to changelog * Add #8986 to changelog * Add #9005 to changelog * Add #9010 to changelog * Add #9012 to changelog * Add #9021 to changelog * Add #9022 to changelog * Add #9056 to changelog * Add #9061 to changelog * Add #9079 to changelog * Add #9080 to changelog * Add #9088 to changelog * Add #9096 to changelog * Add #9097 to changelog * Add #9100 to changelog * Add #9107 to changelog * Add #8969 to changelog * Add #8993 to changelog * Add #9003 to changelog * Add #9031 to changelog * Add #8945 to changelog * Add #9052 to changelog * Add #9058 to changelog * Add #9066 to changelog * Add #9076 to changelog * Add #9053 to changelog * Add #9108 to changelog * Add #9135 to changelog * Add #9148 to changelog * Add #9125 to changelog * Add #9137 to changelog * Added testing instructions for 6.0. * Added IS testing instructions, huge props to @tiagonoronha. * Added #8498 to changelog. * Added #8954 to changelog. * Added #8985 to changelog. * add #9027 * add #9112 to changelog * add #9136 to changelog * add #9102 to changelog * add #9093 to changelog * add #9062 to changelog * add #9172 to changelog
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
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.
This PR modifies the message that appears when a user that is already subscribed to a blog attempts to resubscribe to the blog as per #5812. It adds a link to the subscription management to the message.
Before:
After: