diff --git a/projects/plugins/jetpack/_inc/client/newsletter/email-settings.jsx b/projects/plugins/jetpack/_inc/client/newsletter/email-settings.jsx index dace9b829595a..8e10bede84d67 100644 --- a/projects/plugins/jetpack/_inc/client/newsletter/email-settings.jsx +++ b/projects/plugins/jetpack/_inc/client/newsletter/email-settings.jsx @@ -410,32 +410,32 @@ const EmailSettings = props => {

- { __( 'Replies are not allowed', 'jetpack' ) } + { __( 'Replies will be a public comment on the post', 'jetpack' ) } ), - value: 'no-reply', + value: 'comment', }, { label: ( - { __( 'Replies will be a public comment on the post', 'jetpack' ) } + { __( "Replies will be sent to the post author's email", 'jetpack' ) } ), - value: 'comment', + value: 'author', }, { label: ( - { __( "Replies will be sent to the post author's email", 'jetpack' ) } + { __( 'Replies are not allowed', 'jetpack' ) } ), - value: 'author', + value: 'no-reply', }, ] } onChange={ handleSubscriptionReplyToChange } diff --git a/projects/plugins/jetpack/_inc/lib/class.core-rest-api-endpoints.php b/projects/plugins/jetpack/_inc/lib/class.core-rest-api-endpoints.php index 9bf346ba9ce09..de6f2a99e24d4 100644 --- a/projects/plugins/jetpack/_inc/lib/class.core-rest-api-endpoints.php +++ b/projects/plugins/jetpack/_inc/lib/class.core-rest-api-endpoints.php @@ -33,6 +33,8 @@ // Each of these is a class that will register its own routes on 'rest_api_init'. require_once JETPACK__PLUGIN_DIR . '_inc/lib/core-api/load-wpcom-endpoints.php'; +require_once JETPACK__PLUGIN_DIR . 'modules/subscriptions/class-settings.php'; + /** * Class Jetpack_Core_Json_Api_Endpoints * @@ -2704,7 +2706,7 @@ public static function get_updateable_data_list( $selector = '' ) { 'jetpack_subscriptions_reply_to' => array( 'description' => esc_html__( 'Reply to email behaviour for newsletters emails', 'jetpack' ), 'type' => 'string', - 'default' => 'no-reply', + 'default' => Automattic\Jetpack\Modules\Subscriptions\Settings::$default_reply_to, 'validate_callback' => __CLASS__ . '::validate_subscriptions_reply_to', 'jp_group' => 'subscriptions', ), diff --git a/projects/plugins/jetpack/_inc/lib/core-api/class.jetpack-core-api-module-endpoints.php b/projects/plugins/jetpack/_inc/lib/core-api/class.jetpack-core-api-module-endpoints.php index b9d8d14c028f9..d6419f99740c6 100644 --- a/projects/plugins/jetpack/_inc/lib/core-api/class.jetpack-core-api-module-endpoints.php +++ b/projects/plugins/jetpack/_inc/lib/core-api/class.jetpack-core-api-module-endpoints.php @@ -952,7 +952,7 @@ public function update_data( $request ) { require_once JETPACK__PLUGIN_DIR . 'modules/subscriptions/class-settings.php'; $sub_value = Automattic\Jetpack\Modules\Subscriptions\Settings::is_valid_reply_to( $value ) ? $value - : Automattic\Jetpack\Modules\Subscriptions\Settings::get_default_reply_to(); + : Automattic\Jetpack\Modules\Subscriptions\Settings::$default_reply_to; $updated = (string) get_option( $option ) !== (string) $sub_value ? update_option( $option, $sub_value ) : true; break; diff --git a/projects/plugins/jetpack/changelog/update-change-default-reply-to-option b/projects/plugins/jetpack/changelog/update-change-default-reply-to-option new file mode 100644 index 0000000000000..607764eb6ce78 --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-change-default-reply-to-option @@ -0,0 +1,4 @@ +Significance: minor +Type: enhancement + +Newsletter: change default reply-to option from "no reply" to "comments" diff --git a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php index 7b9d436f012df..56f99d6c9362f 100644 --- a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php +++ b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php @@ -1003,7 +1003,7 @@ function ( &$value ) { require_once JETPACK__PLUGIN_DIR . 'modules/subscriptions/class-settings.php'; $to_set_value = Automattic\Jetpack\Modules\Subscriptions\Settings::is_valid_reply_to( $value ) ? (string) $value - : Automattic\Jetpack\Modules\Subscriptions\Settings::get_default_reply_to(); + : Automattic\Jetpack\Modules\Subscriptions\Settings::$default_reply_to; if ( update_option( $key, $to_set_value ) ) { $updated[ $key ] = $to_set_value; @@ -1302,7 +1302,7 @@ protected function get_subscriptions_reply_to_option() { $reply_to = get_option( 'jetpack_subscriptions_reply_to', null ); if ( $reply_to === null ) { require_once JETPACK__PLUGIN_DIR . 'modules/subscriptions/class-settings.php'; - return Automattic\Jetpack\Modules\Subscriptions\Settings::get_default_reply_to(); + return Automattic\Jetpack\Modules\Subscriptions\Settings::$default_reply_to; } return $reply_to; } diff --git a/projects/plugins/jetpack/modules/subscriptions/class-settings.php b/projects/plugins/jetpack/modules/subscriptions/class-settings.php index 2fd8106acd88d..16607dcb9ca25 100644 --- a/projects/plugins/jetpack/modules/subscriptions/class-settings.php +++ b/projects/plugins/jetpack/modules/subscriptions/class-settings.php @@ -9,12 +9,16 @@ namespace Automattic\Jetpack\Modules\Subscriptions; -use Automattic\Jetpack\Status\Host; - /** * Class Settings */ class Settings { + /** + * The default reply-to option. + * + * @var string + */ + public static $default_reply_to = 'comment'; /** * Validate the reply-to option. @@ -29,16 +33,4 @@ public static function is_valid_reply_to( $reply_to ) { } return false; } - /** - * Get the default reply-to option. - * - * @return string The default reply-to option. - */ - public static function get_default_reply_to() { - if ( ( new Host() )->is_wpcom_simple() ) { - return 'comment'; - } - - return 'no-reply'; - } }