The creator network is the network of websites either hosted with WordPress.com or self-hosted and connected with Jetpack.
-Sites that are part of the creator network can gain exposure to new readers. Sites on the Creator plan have enhanced distribution to more areas of the Reader.
', - 'jetpack-my-jetpack' - ), - ), - 'tiers' => array( - self::FREE_TIER_SLUG => array( 'included' => true ), - self::UPGRADED_TIER_SLUG => array( 'included' => true ), - ), - ), array( 'name' => __( 'Jetpack Blocks', 'jetpack-my-jetpack' ), 'info' => array( diff --git a/projects/packages/scheduled-updates/CHANGELOG.md b/projects/packages/scheduled-updates/CHANGELOG.md index aca6428280e70..91c8ef8b5b77a 100644 --- a/projects/packages/scheduled-updates/CHANGELOG.md +++ b/projects/packages/scheduled-updates/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.5.1] - 2024-03-22 +### Fixed +- Fixed a bug where the weekday index was not properly accounted for in list of weekdays. [#36524] +- Transfer status when editing a schedule. [#36521] + ## [0.5.0] - 2024-03-20 ### Added - Add a new plugin deletion hook that remove the plugin from the scheduled updates. [#36458] @@ -81,6 +86,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Generate initial package for Scheduled Updates [#35796] +[0.5.1]: https://github.com/Automattic/scheduled-updates/compare/v0.5.0...v0.5.1 [0.5.0]: https://github.com/Automattic/scheduled-updates/compare/v0.4.1...v0.5.0 [0.4.1]: https://github.com/Automattic/scheduled-updates/compare/v0.4.0...v0.4.1 [0.4.0]: https://github.com/Automattic/scheduled-updates/compare/v0.3.4...v0.4.0 diff --git a/projects/packages/scheduled-updates/src/class-scheduled-updates.php b/projects/packages/scheduled-updates/src/class-scheduled-updates.php index bbefd19c82003..9256db192e337 100644 --- a/projects/packages/scheduled-updates/src/class-scheduled-updates.php +++ b/projects/packages/scheduled-updates/src/class-scheduled-updates.php @@ -20,7 +20,7 @@ class Scheduled_Updates { * * @var string */ - const PACKAGE_VERSION = '0.5.0'; + const PACKAGE_VERSION = '0.5.1'; /** * The cron event hook for the scheduled plugins update. * @@ -221,30 +221,30 @@ public static function get_scheduled_update_text( $schedule ) { $html = sprintf( /* translators: %s is the time of day. Daily at 10 am. */ esc_html__( 'Daily at %s.', 'jetpack-scheduled-updates' ), - get_date_from_gmt( gmdate( 'Y-m-d H:i:s', $schedule->timestamp ), get_option( 'time_format' ) ) + wp_date( get_option( 'time_format' ), $schedule->timestamp ) ); } else { // Not getting smart about passing in weekdays makes it easier to translate. $weekdays = array( - /* translators: %s is the time of day. Sundays at 10 am. */ - __( 'Sundays at %s.', 'jetpack-scheduled-updates' ), /* translators: %s is the time of day. Mondays at 10 am. */ - __( 'Mondays at %s.', 'jetpack-scheduled-updates' ), + 1 => __( 'Mondays at %s.', 'jetpack-scheduled-updates' ), /* translators: %s is the time of day. Tuesdays at 10 am. */ - __( 'Tuesdays at %s.', 'jetpack-scheduled-updates' ), + 2 => __( 'Tuesdays at %s.', 'jetpack-scheduled-updates' ), /* translators: %s is the time of day. Wednesdays at 10 am. */ - __( 'Wednesdays at %s.', 'jetpack-scheduled-updates' ), + 3 => __( 'Wednesdays at %s.', 'jetpack-scheduled-updates' ), /* translators: %s is the time of day. Thursdays at 10 am. */ - __( 'Thursdays at %s.', 'jetpack-scheduled-updates' ), + 4 => __( 'Thursdays at %s.', 'jetpack-scheduled-updates' ), /* translators: %s is the time of day. Fridays at 10 am. */ - __( 'Fridays at %s.', 'jetpack-scheduled-updates' ), + 5 => __( 'Fridays at %s.', 'jetpack-scheduled-updates' ), /* translators: %s is the time of day. Saturdays at 10 am. */ - __( 'Saturdays at %s.', 'jetpack-scheduled-updates' ), + 6 => __( 'Saturdays at %s.', 'jetpack-scheduled-updates' ), + /* translators: %s is the time of day. Sundays at 10 am. */ + 7 => __( 'Sundays at %s.', 'jetpack-scheduled-updates' ), ); $html = sprintf( - $weekdays[ date_i18n( 'N', $schedule->timestamp ) ], - get_date_from_gmt( gmdate( 'Y-m-d H:i:s', $schedule->timestamp ), get_option( 'time_format' ) ) + $weekdays[ wp_date( 'N', $schedule->timestamp ) ], + wp_date( get_option( 'time_format' ), $schedule->timestamp ) ); } diff --git a/projects/packages/scheduled-updates/src/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-update-schedules.php b/projects/packages/scheduled-updates/src/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-update-schedules.php index 79bdcf846af17..286d9b12eaba6 100644 --- a/projects/packages/scheduled-updates/src/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-update-schedules.php +++ b/projects/packages/scheduled-updates/src/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-update-schedules.php @@ -331,12 +331,21 @@ public function update_item( $request ) { return $result; } + $previous_schedule_status = Scheduled_Updates::get_scheduled_update_status( $request['schedule_id'] ); + $deleted = $this->delete_item( $request ); if ( is_wp_error( $deleted ) ) { return $deleted; } - return $this->create_item( $request ); + $item = $this->create_item( $request ); + + // Sets the previous status + if ( $previous_schedule_status ) { + Scheduled_Updates::set_scheduled_update_status( $item->data, $previous_schedule_status['last_run_timestamp'], $previous_schedule_status['last_run_status'] ); + } + + return $item; } /** diff --git a/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-test.php b/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-test.php index 8bae36af10326..ced9d0f49c857 100644 --- a/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-test.php +++ b/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-test.php @@ -63,7 +63,7 @@ protected function set_up() { // Ensure plugin directory exists. $this->wp_filesystem->mkdir( $this->plugin_dir ); - // init the hook + // Init the hook. add_action( 'rest_api_init', array( 'Automattic\Jetpack\Scheduled_Updates', 'add_is_managed_extension_field' ) ); do_action( 'rest_api_init' ); @@ -75,10 +75,10 @@ protected function set_up() { * @after */ protected function tear_down() { - // Clean up the temporary plugin directory + // Clean up the temporary plugin directory. $this->wp_filesystem->rmdir( $this->plugin_dir, true ); - // Clean up the plugins cache created by get_plugins() + // Clean up the plugins cache created by get_plugins(). wp_cache_delete( 'plugins', 'plugins' ); wp_clear_scheduled_hook( Scheduled_Updates::PLUGIN_CRON_HOOK ); @@ -94,12 +94,12 @@ protected function tear_down() { * @covers ::add_is_managed_extension_field */ public function test_unmanaged_plugins() { - // direct + // Direct. $plugin_name = 'direct-plugin'; $this->wp_filesystem->mkdir( "$this->plugin_dir/$plugin_name" ); $this->populate_file_with_plugin_header( "$this->plugin_dir/$plugin_name/$plugin_name.php", 'direct-plugin' ); - // make sure the directory exists + // Make sure the directory exists. $this->assertTrue( $this->wp_filesystem->is_dir( "$this->plugin_dir/direct-plugin" ) ); $request = new \WP_REST_Request( 'GET', '/wp/v2/plugins' ); @@ -117,7 +117,7 @@ public function test_unmanaged_plugins() { * @covers ::add_is_managed_extension_field */ public function test_unmanaged_plugins_not_in_root_directory() { - // we simulate a symlink to a subdirectory inside a wp directory + // We simulate a symlink to a subdirectory inside a wp directory. $plugin_name = 'managed-plugin'; $target_dir = "$this->plugin_dir/wordpress"; $this->wp_filesystem->mkdir( $target_dir ); @@ -125,7 +125,7 @@ public function test_unmanaged_plugins_not_in_root_directory() { $this->populate_file_with_plugin_header( "$target_dir/$plugin_name/$plugin_name.php", 'managed-plugin' ); symlink( "$target_dir/$plugin_name", "$this->plugin_dir/$plugin_name" ); - // make sure the symlink exists + // Make sure the symlink exists. $this->assertFalse( $this->wp_filesystem->is_dir( "$this->plugin_dir/direct-plugin" ) ); $this->assertTrue( is_link( "$this->plugin_dir/managed-plugin" ) ); @@ -144,7 +144,7 @@ public function test_unmanaged_plugins_not_in_root_directory() { * @covers ::add_is_managed_extension_field */ public function test_managed_plugins() { - // we simulate a symlink to a subdirectory inside a wp directory + // We simulate a symlink to a subdirectory inside a wp directory. $plugin_name = 'managed-plugin'; $target_dir = "$this->plugin_dir/wordpress"; $this->wp_filesystem->mkdir( $target_dir ); @@ -152,11 +152,11 @@ public function test_managed_plugins() { $this->populate_file_with_plugin_header( "$target_dir/$plugin_name/$plugin_name.php", 'managed-plugin' ); symlink( "$target_dir/$plugin_name", "$this->plugin_dir/$plugin_name" ); - // make sure the symlink exists + // Make sure the symlink exists. $this->assertFalse( $this->wp_filesystem->is_dir( "$this->plugin_dir/direct-plugin" ) ); $this->assertTrue( is_link( "$this->plugin_dir/managed-plugin" ) ); - // tweak realpath so that it returns `/wordpress/...` + // Tweak realpath so that it returns `/wordpress/...`. $realpath = $this->getFunctionMock( __NAMESPACE__, 'realpath' ); $realpath->expects( $this->once() )->willReturn( "/wordpress/plugins/$plugin_name" ); @@ -554,6 +554,50 @@ public function test_delete_plugin_new_events_inherit_statuses() { } } + /** + * Test get_scheduled_update_text. + * + * @dataProvider update_text_provider + * @covers ::get_scheduled_update_text + * + * @param object $schedule The schedule object. + * @param string $expected The expected text. + */ + public function test_get_scheduled_update_text( $schedule, $expected ) { + $this->assertSame( $expected, Scheduled_Updates::get_scheduled_update_text( $schedule ) ); + } + + /** + * Data provider for test_get_scheduled_update_text. + * + * @return array[] + */ + public function update_text_provider() { + return array( + array( + (object) array( + 'timestamp' => strtotime( 'next Monday 00:00' ), + 'interval' => WEEK_IN_SECONDS, + ), + sprintf( 'Mondays at %s.', gmdate( get_option( 'time_format' ), strtotime( 'next Monday 8:00' ) ) ), + ), + array( + (object) array( + 'timestamp' => strtotime( 'next Tuesday 00:00' ), + 'interval' => DAY_IN_SECONDS, + ), + sprintf( 'Daily at %s.', gmdate( get_option( 'time_format' ), strtotime( 'next Tuesday 8:00' ) ) ), + ), + array( + (object) array( + 'timestamp' => strtotime( 'next Sunday 00:00' ), + 'interval' => WEEK_IN_SECONDS, + ), + sprintf( 'Sundays at %s.', gmdate( get_option( 'time_format' ), strtotime( 'next Sunday 8:00' ) ) ), + ), + ); + } + /** * Create a list of plugins to be deleted. * diff --git a/projects/packages/scheduled-updates/tests/php/class-wpcom-rest-api-v2-endpoint-update-schedules-test.php b/projects/packages/scheduled-updates/tests/php/class-wpcom-rest-api-v2-endpoint-update-schedules-test.php index efc0968a9ac87..d701555870574 100644 --- a/projects/packages/scheduled-updates/tests/php/class-wpcom-rest-api-v2-endpoint-update-schedules-test.php +++ b/projects/packages/scheduled-updates/tests/php/class-wpcom-rest-api-v2-endpoint-update-schedules-test.php @@ -563,6 +563,55 @@ public function test_update_item() { $this->assertSame( $schedule_id, $result->get_data() ); } + /** + * Test update item. + * + * @covers ::update_item + */ + public function test_update_item_with_status() { + $plugins = array( + 'custom-plugin/custom-plugin.php', + 'gutenberg/gutenberg.php', + ); + $timestamp = strtotime( 'last Monday 8:00' ); + $status = 'success'; + + $schedule_id = Scheduled_Updates::generate_schedule_id( $plugins ); + + wp_schedule_event( strtotime( 'next Monday 8:00' ), 'weekly', Scheduled_Updates::PLUGIN_CRON_HOOK, $plugins ); + + Scheduled_Updates::set_scheduled_update_status( $schedule_id, $timestamp, $status ); + + $request = new WP_REST_Request( 'PUT', '/wpcom/v2/update-schedules/' . $schedule_id ); + $request->set_body_params( + array( + 'plugins' => $plugins, + 'schedule' => array( + 'timestamp' => strtotime( 'next Tuesday 9:00' ), + 'interval' => 'daily', + ), + ) + ); + + // Successful request. + wp_set_current_user( $this->admin_id ); + $result = rest_do_request( $request ); + + $this->assertSame( 200, $result->get_status() ); + $schedule_id = $result->get_data(); + + // Get the updated status + $updated_status = Scheduled_Updates::get_scheduled_update_status( $schedule_id ); + if ( $updated_status === null ) { + $this->fail( 'Scheduled_Updates::get_scheduled_update_status() returned null.' ); + } else { + $this->assertIsArray( $updated_status, 'Scheduled_Updates::get_scheduled_update_status() should return an array.' ); + // doing these null checks for the static analyzer + $this->assertSame( $timestamp, $updated_status['last_run_timestamp'] ?? null ); + $this->assertSame( $status, $updated_status['last_run_status'] ?? null ); + } + } + /** * Test update_item with invalid schedule ID. * diff --git a/projects/packages/status/CHANGELOG.md b/projects/packages/status/CHANGELOG.md index 2f38f96192867..19d01b54aaa4c 100644 --- a/projects/packages/status/CHANGELOG.md +++ b/projects/packages/status/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.2.0] - 2024-03-22 +### Added +- Add support for A8C for Agencies source parameter. [#36491] + ## [2.1.3] - 2024-03-20 ### Changed - Internal updates. @@ -318,6 +322,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Packages: Introduce a status package +[2.2.0]: https://github.com/Automattic/jetpack-status/compare/v2.1.3...v2.2.0 [2.1.3]: https://github.com/Automattic/jetpack-status/compare/v2.1.2...v2.1.3 [2.1.2]: https://github.com/Automattic/jetpack-status/compare/v2.1.1...v2.1.2 [2.1.1]: https://github.com/Automattic/jetpack-status/compare/v2.1.0...v2.1.1 diff --git a/projects/packages/status/composer.json b/projects/packages/status/composer.json index 3f5a5762aae54..444ab5434111e 100644 --- a/projects/packages/status/composer.json +++ b/projects/packages/status/composer.json @@ -47,7 +47,7 @@ "link-template": "https://github.com/Automattic/jetpack-status/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.1.x-dev" + "dev-trunk": "2.2.x-dev" } } } diff --git a/projects/packages/status/src/class-host.php b/projects/packages/status/src/class-host.php index 04d78904e2017..9597fd34120be 100644 --- a/projects/packages/status/src/class-host.php +++ b/projects/packages/status/src/class-host.php @@ -127,7 +127,7 @@ public function get_calypso_env() { */ public function get_source_query() { // phpcs:disable WordPress.Security.NonceVerification.Recommended - $allowed_sources = array( 'jetpack-manage' ); + $allowed_sources = array( 'jetpack-manage', 'a8c-for-agencies' ); if ( isset( $_GET['source'] ) && in_array( $_GET['source'], $allowed_sources, true ) ) { return sanitize_key( $_GET['source'] ); } diff --git a/projects/packages/status/tests/php/test-host.php b/projects/packages/status/tests/php/test-host.php index ff24b0b21db4e..3cc1ad2f07982 100644 --- a/projects/packages/status/tests/php/test-host.php +++ b/projects/packages/status/tests/php/test-host.php @@ -233,10 +233,11 @@ function ( $value ) { * @return array */ public function get_source_query_params() { - return array( - 'empty' => array( '', '' ), - 'valid' => array( 'jetpack-manage', 'jetpack-manage' ), - 'invalid' => array( 'invalid-param', '' ), - ); + return array( + 'empty' => array( '', '' ), + 'valid_manage' => array( 'jetpack-manage', 'jetpack-manage' ), + 'valid_a4a' => array( 'a8c-for-agencies', 'a8c-for-agencies' ), + 'invalid' => array( 'invalid-param', '' ), + ); } } diff --git a/projects/packages/transport-helper/actions.php b/projects/packages/transport-helper/actions.php index e5d0c355b50e1..9621437e18fa8 100644 --- a/projects/packages/transport-helper/actions.php +++ b/projects/packages/transport-helper/actions.php @@ -23,10 +23,10 @@ } // Clean up expired Jetpack Helper Scripts from a scheduled event. -$add_action( 'jetpack_cleanup_helper_scripts', array( 'Automattic\\Jetpack\\Backup\\V0003\\Helper_Script_Manager', 'cleanup_expired_helper_scripts' ) ); +$add_action( 'jetpack_cleanup_helper_scripts', array( 'Automattic\\Jetpack\\Backup\\V0004\\Helper_Script_Manager', 'cleanup_expired_helper_scripts' ) ); // Register REST routes. -$add_action( 'rest_api_init', array( 'Automattic\\Jetpack\\Transport_Helper\\V0003\\REST_Controller', 'register_rest_routes' ) ); +$add_action( 'rest_api_init', array( 'Automattic\\Jetpack\\Transport_Helper\\V0004\\REST_Controller', 'register_rest_routes' ) ); // Set up package version hook. $add_filter( 'jetpack_package_versions', 'Automattic\\Jetpack\\Transport_Helper\\Package_Version::send_package_version_to_tracker' ); diff --git a/projects/packages/transport-helper/changelog/backup-change-log-label b/projects/packages/transport-helper/changelog/backup-change-log-label new file mode 100644 index 0000000000000..abe37d7ec52e8 --- /dev/null +++ b/projects/packages/transport-helper/changelog/backup-change-log-label @@ -0,0 +1,4 @@ +Significance: patch +Type: fixed + +Backup: change some error messages to not trigger security scanners diff --git a/projects/packages/transport-helper/package.json b/projects/packages/transport-helper/package.json index 72a0cc8e36b94..957f68aaa8def 100644 --- a/projects/packages/transport-helper/package.json +++ b/projects/packages/transport-helper/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-transport-helper", - "version": "0.2.2", + "version": "0.2.3-alpha", "description": "Package to help transport server communication", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/transport-helper/#readme", "bugs": { diff --git a/projects/packages/transport-helper/src/class-package-version.php b/projects/packages/transport-helper/src/class-package-version.php index fd6cb38e86597..e92fcbf893069 100644 --- a/projects/packages/transport-helper/src/class-package-version.php +++ b/projects/packages/transport-helper/src/class-package-version.php @@ -16,7 +16,7 @@ */ class Package_Version { - const PACKAGE_VERSION = '0.2.2'; + const PACKAGE_VERSION = '0.2.3-alpha'; const PACKAGE_SLUG = 'transport-helper'; diff --git a/projects/packages/transport-helper/src/class-rest-controller.php b/projects/packages/transport-helper/src/class-rest-controller.php index 0eda452a11547..9bdf49ebb4775 100644 --- a/projects/packages/transport-helper/src/class-rest-controller.php +++ b/projects/packages/transport-helper/src/class-rest-controller.php @@ -10,9 +10,9 @@ // order to ensure that the specific version of this file always get loaded. Otherwise, Jetpack autoloader might decide // to load an older/newer version of the class (if, for example, both the standalone and bundled versions of the plugin // are installed, or in some other cases). -namespace Automattic\Jetpack\Transport_Helper\V0003; +namespace Automattic\Jetpack\Transport_Helper\V0004; -use Automattic\Jetpack\Backup\V0003\Helper_Script_Manager; +use Automattic\Jetpack\Backup\V0004\Helper_Script_Manager; use Automattic\Jetpack\Connection\Rest_Authentication; use WP_Error; use WP_REST_Request; diff --git a/projects/packages/transport-helper/tests/php/test-rest-controller.php b/projects/packages/transport-helper/tests/php/test-rest-controller.php index 56f32fbb29c57..0653706dd0e18 100644 --- a/projects/packages/transport-helper/tests/php/test-rest-controller.php +++ b/projects/packages/transport-helper/tests/php/test-rest-controller.php @@ -4,7 +4,7 @@ // order to ensure that the specific version of this file always get loaded. Otherwise, Jetpack autoloader might decide // to load an older/newer version of the class (if, for example, both the standalone and bundled versions of the plugin // are installed, or in some other cases). -namespace Automattic\Jetpack\Transport_Helper\V0003; +namespace Automattic\Jetpack\Transport_Helper\V0004; use Automattic\Jetpack\Connection\Rest_Authentication as Connection_Rest_Authentication; use PHPUnit\Framework\TestCase; @@ -63,7 +63,7 @@ public function set_up() { wp_set_current_user( 0 ); // Register REST routes. - add_action( 'rest_api_init', array( 'Automattic\\Jetpack\\Transport_Helper\\V0003\\REST_Controller', 'register_rest_routes' ) ); + add_action( 'rest_api_init', array( 'Automattic\\Jetpack\\Transport_Helper\\V0004\\REST_Controller', 'register_rest_routes' ) ); do_action( 'rest_api_init' ); } diff --git a/projects/plugins/mu-wpcom-plugin/changelog/add-verbum-settings b/projects/plugins/automattic-for-agencies-client/changelog/add-a4a-source-to-jetpack-connect-url similarity index 100% rename from projects/plugins/mu-wpcom-plugin/changelog/add-verbum-settings rename to projects/plugins/automattic-for-agencies-client/changelog/add-a4a-source-to-jetpack-connect-url diff --git a/projects/plugins/automattic-for-agencies-client/composer.lock b/projects/plugins/automattic-for-agencies-client/composer.lock index 33713623d68c4..243a3711c2ff8 100644 --- a/projects/plugins/automattic-for-agencies-client/composer.lock +++ b/projects/plugins/automattic-for-agencies-client/composer.lock @@ -873,7 +873,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "462582ef61f3f6be46574acb34c8d7f59adcdae9" + "reference": "90b8d62a2a976c5a39114c1e6f295faaa5ebb2d0" }, "require": { "automattic/jetpack-constants": "@dev", @@ -896,7 +896,7 @@ "link-template": "https://github.com/Automattic/jetpack-status/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.1.x-dev" + "dev-trunk": "2.2.x-dev" } }, "autoload": { diff --git a/projects/packages/connection/changelog/add-a4a-plugin-skeleton b/projects/plugins/backup/changelog/add-a4a-source-to-jetpack-connect-url similarity index 51% rename from projects/packages/connection/changelog/add-a4a-plugin-skeleton rename to projects/plugins/backup/changelog/add-a4a-source-to-jetpack-connect-url index ac545b7b59239..9aa70e3ec1f75 100644 --- a/projects/packages/connection/changelog/add-a4a-plugin-skeleton +++ b/projects/plugins/backup/changelog/add-a4a-source-to-jetpack-connect-url @@ -1,4 +1,5 @@ Significance: patch Type: changed +Comment: Updated composer.lock. + -yUpdate Phan config. diff --git a/projects/plugins/backup/changelog/add-bad-installation-notices-to-my-jetpack b/projects/plugins/backup/changelog/add-bad-installation-notices-to-my-jetpack new file mode 100644 index 0000000000000..7a8c5684ef4be --- /dev/null +++ b/projects/plugins/backup/changelog/add-bad-installation-notices-to-my-jetpack @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Trigger red bubble notification when bad install is detected diff --git a/projects/plugins/backup/changelog/backup-change-log-label b/projects/plugins/backup/changelog/backup-change-log-label new file mode 100644 index 0000000000000..abe37d7ec52e8 --- /dev/null +++ b/projects/plugins/backup/changelog/backup-change-log-label @@ -0,0 +1,4 @@ +Significance: patch +Type: fixed + +Backup: change some error messages to not trigger security scanners diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock index b26af18ce672d..4489517efc47d 100644 --- a/projects/plugins/backup/composer.lock +++ b/projects/plugins/backup/composer.lock @@ -1491,7 +1491,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "462582ef61f3f6be46574acb34c8d7f59adcdae9" + "reference": "90b8d62a2a976c5a39114c1e6f295faaa5ebb2d0" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1514,7 +1514,7 @@ "link-template": "https://github.com/Automattic/jetpack-status/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.1.x-dev" + "dev-trunk": "2.2.x-dev" } }, "autoload": { diff --git a/projects/plugins/backup/jetpack-backup.php b/projects/plugins/backup/jetpack-backup.php index f641c5c23a31d..26d9f7aea0add 100644 --- a/projects/plugins/backup/jetpack-backup.php +++ b/projects/plugins/backup/jetpack-backup.php @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -use Automattic\Jetpack\Backup\V0003\Jetpack_Backup as My_Jetpack_Backup; +use Automattic\Jetpack\Backup\V0004\Jetpack_Backup as My_Jetpack_Backup; use Automattic\Jetpack\My_Jetpack\Initializer as My_Jetpack_Initializer; if ( ! defined( 'ABSPATH' ) ) { @@ -100,6 +100,20 @@ function () use ( $jetpack_backup_meets_requirements ) { ); } + // Add a red bubble notification to My Jetpack if the installation is bad. + add_filter( + 'my_jetpack_red_bubble_notification_slugs', + function ( $slugs ) { + $slugs['jetpack-vaultpress-backup-plugin-bad-installation'] = array( + 'data' => array( + 'plugin' => 'Jetpack VaultPress Backup', + ), + ); + + return $slugs; + } + ); + add_action( 'admin_notices', function () { @@ -166,7 +180,7 @@ function ( $actions ) { } ); -register_deactivation_hook( __FILE__, array( 'Automattic\\Jetpack\\Backup\\V0003\\Jetpack_Backup', 'plugin_deactivation' ) ); +register_deactivation_hook( __FILE__, array( 'Automattic\\Jetpack\\Backup\\V0004\\Jetpack_Backup', 'plugin_deactivation' ) ); // Main plugin class. My_Jetpack_Backup::initialize(); diff --git a/projects/plugins/beta/changelog/add-bad-installation-notices-to-my-jetpack b/projects/plugins/beta/changelog/add-bad-installation-notices-to-my-jetpack new file mode 100644 index 0000000000000..5cf6fb645e17e --- /dev/null +++ b/projects/plugins/beta/changelog/add-bad-installation-notices-to-my-jetpack @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Hook into red bubble notification when bad installation is detected diff --git a/projects/plugins/beta/jetpack-beta.php b/projects/plugins/beta/jetpack-beta.php index 72a05dd390a1c..559b00a2da9e1 100644 --- a/projects/plugins/beta/jetpack-beta.php +++ b/projects/plugins/beta/jetpack-beta.php @@ -63,6 +63,20 @@ ); } + // Add a red bubble notification to My Jetpack if the installation is bad. + add_filter( + 'my_jetpack_red_bubble_notification_slugs', + function ( $slugs ) { + $slugs['jetpack-beta-plugin-bad-installation'] = array( + 'data' => array( + 'plugin' => 'Jetpack Beta', + ), + ); + + return $slugs; + } + ); + /** * Outputs an admin notice for folks running Jetpack Beta without having run composer install. * diff --git a/projects/plugins/boost/app/assets/src/js/features/boost-pricing-table/lib/features.tsx b/projects/plugins/boost/app/assets/src/js/features/boost-pricing-table/lib/features.tsx index b09c844b9fa07..6ddf7e4532764 100644 --- a/projects/plugins/boost/app/assets/src/js/features/boost-pricing-table/lib/features.tsx +++ b/projects/plugins/boost/app/assets/src/js/features/boost-pricing-table/lib/features.tsx @@ -114,14 +114,14 @@ type FeatureItem = { export const boostFeatureList: FeatureItem[] = [ { description: { - name: __( 'Optimize CSS Loading', 'jetpack-boost' ), + name: __( 'Auto CSS Optimization', 'jetpack-boost' ), tooltipInfo: cssOptimizationContext, tooltipPlacement: 'bottom-start', }, free: (- { __( - 'Add an extra layer of security to your website by enabling WordPress.com login and secure authentication. If you have multiple sites with this option enabled, you will be able to log in to every one of them with the same credentials.', - 'jetpack' - ) } -
-/g, '
' . __( 'Switch Accounts', 'jetpack' ) . '
+ // We cannot use wpcom_logmein_redirect_url since it returns redirect URL when user is already logged in. + $login_link = add_query_arg( + array( + 'redirect_to' => rawurlencode( get_current_url() ), + 'blog_id' => get_current_blog_id(), + ), + 'https://wordpress.com/log-in/link' + ); + $switch_accounts_link = wp_logout_url( $login_link ); + $login_block = ' ++ ' . __( 'Switch accounts', 'jetpack' ) . ' +
'; - } } else { $access_question = get_paywall_access_question( $newsletter_access_level ); - $sign_in = ' + $login_block = '| + + | ++ + | +
|---|