Merge branch 'trunk' into update/unbundle-publicize-from-jetpack

projects/packages/jetpack-mu-wpcom/changelog/fix-disabled-email-address

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Simple Classic: make Users -> Profile -> Email input readonly instead of disabled

projects/packages/jetpack-mu-wpcom/src/features/wpcom-profile-settings/profile-settings-link-to-wpcom.ts

@@ -7,7 +7,7 @@ const wpcom_profile_settings_disable_email_field = () => {
 	}
 	const emailField = document.getElementById( 'email' ) as HTMLInputElement;
 	if ( emailField ) {
-		emailField.disabled = true;
+		emailField.readOnly = true;
 	}
 
 	const emailDescription = document.getElementById( 'email-description' ) as HTMLInputElement;

projects/packages/sync/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).
 
+## [3.5.0] - 2024-08-06
+### Changed
+- Sync: Change fields for HPOS checksums [#38713]
+
 ## [3.4.1] - 2024-08-05
 ### Fixed
 - Jetpack Sync: Take order type into account when performing  HPOS Checksums [#38688]
@@ -1223,6 +1227,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Packages: Move sync to a classmapped package
 
+[3.5.0]: https://github.com/Automattic/jetpack-sync/compare/v3.4.1...v3.5.0
 [3.4.1]: https://github.com/Automattic/jetpack-sync/compare/v3.4.0...v3.4.1
 [3.4.0]: https://github.com/Automattic/jetpack-sync/compare/v3.3.1...v3.4.0
 [3.3.1]: https://github.com/Automattic/jetpack-sync/compare/v3.3.0...v3.3.1

projects/packages/sync/src/class-package-version.php

@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '3.5.0-alpha';
+	const PACKAGE_VERSION = '3.5.0';
 
 	const PACKAGE_SLUG = 'sync';
 

projects/packages/waf/changelog/fix-waf-request-body-problem

@@ -0,0 +1,4 @@
+Significance: patch
+Type: security
+
+Parse request body when method used is not POST

projects/packages/waf/src/class-waf-request.php

@@ -334,13 +334,18 @@ public function get_get_vars() {
 	 * @return array{string, scalar}[]
 	 */
 	public function get_post_vars() {
-		// Attempt to decode JSON requests.
-		if ( strpos( $this->get_header( 'content-type' ), 'application/json' ) !== false ) {
+		if ( ! empty( $_POST ) ) {
+			return flatten_array( $_POST );
+		} elseif ( strpos( $this->get_header( 'content-type' ), 'application/json' ) !== false ) {
+			// Attempt to decode JSON requests.
 			$decoded_json = json_decode( $this->get_body(), true ) ?? array();
 			return flatten_array( $decoded_json, 'json', true );
+		} else {
+			// Attempt to retrieve all parameters when method used isn't POST
+			$body = $this->get_body();
+			parse_str( $body, $params );
+			return flatten_array( $params );
 		}
-
-		return flatten_array( $_POST );
 	}
 
 	/**

projects/packages/waf/tests/php/unit/test-waf-request.php

@@ -297,6 +297,8 @@ public function testGetVarsPost() {
 		$this->assertContains( array( 'test_var', 'test_value' ), $value );
 		$this->assertContains( array( 'test_2[child]', 'value' ), $value );
 		$this->assertContains( array( 'test_num[0]', 'value1' ), $value );
+
+		$_POST = array();
 	}
 
 	/**
@@ -327,6 +329,35 @@ public function testGetVarsPostWithJson() {
 		unset( $_SERVER['CONTENT_TYPE'] );
 	}
 
+	/**
+	 * Test that the Waf_Request class returns any parameters when HTTP method isn't POST.
+	 */
+	public function testGetVarsPostHttpMethodNotPost() {
+		$_SERVER['CONTENT_TYPE'] = 'application/x-www-form-urlencoded';
+		$request                 = $this->mock_request(
+			array(
+				'body' => (
+					http_build_query(
+						array(
+							'str' => 'value',
+							'arr' => array( 'a', 'b', 'c' ),
+							'obj' => (object) array( 'foo' => 'bar' ),
+						)
+					)
+				),
+			)
+		);
+		$value                   = $request->get_post_vars();
+		$this->assertIsArray( $value );
+		$this->assertContains( array( 'str', 'value' ), $value );
+		$this->assertContains( array( 'arr[0]', 'a' ), $value );
+		$this->assertContains( array( 'arr[1]', 'b' ), $value );
+		$this->assertContains( array( 'arr[2]', 'c' ), $value );
+		$this->assertContains( array( 'obj[foo]', 'bar' ), $value );
+
+		unset( $_SERVER['CONTENT_TYPE'] );
+	}
+
 	/**
 	 * Test that the Waf_Request class transforms and returns $_FILES data correctly via Waf_Request::get_files().
 	 */

projects/plugins/automattic-for-agencies-client/changelog/try-lossless-image-optmization-part-2

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Lossless image optimization of images in projects/plugins [subdirectories from a* through social]

projects/plugins/backup/changelog/try-lossless-image-optmization-part-2

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Lossless image optimization of images in projects/plugins [subdirectories from a* through social]

projects/plugins/beta/changelog/try-lossless-image-optmization-part-2

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Lossless image optimization of images in projects/plugins [subdirectories from a* through social]