Widgets - Simple Payments: fix a few issues #9863
Merged
+57
−26
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
eliorivero
added
[Type] Bug
eliorivero
force-pushed
the
fix/simple-payments-widget
branch
2 times, most recently
from
03aad3d to
244b196
Compare
6 tasks
oskosk
force-pushed
the
fix/simple-payments-widget
branch
from
244b196 to
d51304a
Compare
|
@eliorivero I Merged Mike's PR and rebased this one |
oskosk
added
[Status] Ready to Merge
rodrigoi
suggested changes
Jul 5, 2018
modules/widgets/simple-payments.php
Outdated
| require_lib( 'tracks/client' ); | ||
| tracks_record_event( $current_user, 'simple_payments_button_' . $event_action, $event_properties ); | ||
| jetpack_require_lib( 'tracks/client' ); | ||
| jetpack_tracks_record_event( $current_user, 'simple_payments_button_' . $event_action, $event_properties ); |
There was a problem hiding this comment.
this block of code is for WordPress.com, where jetpack_* functions are not available.
rodrigoi
added
[Status] Needs Author Reply
eliorivero
force-pushed
the
fix/simple-payments-widget
branch
from
d51304a to
2390cd0
Compare
…d syntax error and missing translation domain
eliorivero
force-pushed
the
fix/simple-payments-widget
branch
from
2390cd0 to
592aebb
Compare
eliorivero
commented
Jul 5, 2018
| @@ -96,7 +96,7 @@ class="field-currency widefat jetpack-simple-payments-form-product-currency" | |||
| name="<?php echo esc_attr( $this->get_field_name( 'form_product_currency' ) ); ?>"> | |||
| <?php foreach( Jetpack_Simple_Payments_Widget::$supported_currency_list as $code => $currency ) {?> | |||
| <option value="<?php echo esc_attr( $code ) ?>"<?php selected( $instance['form_product_currency'], $code ); ?>> | |||
| <?php esc_html_e( $code . ' ' . $currency ) ?> | |||
| <?php echo esc_html( "$code $currency" ); ?> | |||
There was a problem hiding this comment.
Replacing this here because esc_html_e is meant to be used when translating and displaying, not just displaying.
rodrigoi
approved these changes
Jul 5, 2018
rodrigoi
added
[Status] Ready to Merge
…ated for translation.
ghost
removed
the
[Status] Ready to Merge
Generated by 🚫 dangerJS |
|
Just for the record, this is blocking D14005-code, that enables the SP Widget on WordPress.com. |
|
@oskosk any idea on the timeline when this could be merged? I believe we'll want this in before we land on wpcom for fusion to sync properly. |
ghost
removed
the
[Status] Ready to Merge
oskosk
pushed a commit
that referenced
this pull request
Jul 31, 2018
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.
Follow-up to #9859
Changes proposed in this Pull Request:
$errors.add( 'illegal_params' );->addjetpacktranslation domainrequire_libandtracks_record_eventTesting instructions
Test with PHP 5.2 and ensure the widget works normally.
Proposed changelog entry for your changes:
PHP 5.2 Compatibility for Simple Payments Widget