Update code for custom Safe Mode text #10489
Draft
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
Updates to match changes in Safe Mode.
Test the buildOption 1. Jetpack Beta
Option 2. Jurassic Ninja - available for logged-in A12s🚀 Launch a JN site with this branch 🚀 ℹ️ Install this Tampermonkey script to get more options. Build info:
Note: the build is updated when a new commit is pushed to this PR. |
|
Size Change: 0 B Total Size: 1.29 MB ℹ️ View Unchanged
|
htdat
reviewed
Mar 6, 2025
Comment on lines
+88
to
+89
| // Always use the actual array result instead of conditionally passing function name or result | ||
| $custom_content = wcpay_get_jetpack_idc_custom_content(); |
There was a problem hiding this comment.
This had been the original approach. However, we needed to use the callback due to an i18n issue #9884
In other words, I am not sure if this is a proper fix @bindlegirl, and cc @zinigor as the author of PR 9884.
There was a problem hiding this comment.
Based on our my debug, it looks like there is a bug around this line
https://github.com/Automattic/jetpack/blame/8a4e01ce5863f03b85eb2152f50bf7fbe632f798/projects/packages/connection/src/identity-crisis/class-ui.php#L171-L178
if ( isset( $consumer['customContent'] ) && is_callable( $consumer['customContent'] ) ) {
// ✅ The callback is called correctly in this condition.
$consumer['customContent'] = call_user_func( $consumer['customContent'] );
}
if ( isset( $_SERVER['REQUEST_URI'] ) && str_starts_with( filter_var( wp_unslash( $_SERVER['REQUEST_URI'] ) ), $consumer['admin_page'] ) && strlen( $consumer['admin_page'] ) > $consumer_url_length ) {
// ❌ Somehow, this condition is never reached; therefore, the `customContent` applied by the callback above is not passed to the output correctly.
$consumer_chosen = $consumer;
$consumer_url_length = strlen( $consumer['admin_page'] );
}There was a problem hiding this comment.
In what way do you experience a bug there?/ Ignore this question, I see what you mean.
To be honest, I wasn't able to reproduce the problem that #9884 was trying to solve.
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.
A proposal for several changes that should fix the custom Safe Mode text.
Fixes #9614
Changes proposed in this Pull Request
Testing instructions
npm run changelogto add a changelog file, choosepatchto leave it empty if the change is not significant. You can add multiple changelog files in one PR by running this command a few times.Post merge