Custom CSS: prevent PHP warning (#38090)

* Custom CSS: prevent PHP warning * Update condition * Bump versions
Automattic · Jun 28, 2024 · 3b7d354 · 3b7d354
1 parent 84d3de2
commit 3b7d354
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/fix-css-tidy-wraning b/projects/packages/jetpack-mu-wpcom/changelog/fix-css-tidy-wraning
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Prevent PHP warning
+
+
diff --git a/projects/packages/jetpack-mu-wpcom/package.json b/projects/packages/jetpack-mu-wpcom/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-mu-wpcom",
-	"version": "5.41.0",
+	"version": "5.41.1-alpha",
 	"description": "Enhances your site with features powered by WordPress.com",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/jetpack-mu-wpcom/#readme",
 	"bugs": {

diff --git a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php
@@ -13,7 +13,7 @@
  * Jetpack_Mu_Wpcom main class.
  */
 class Jetpack_Mu_Wpcom {
-	const PACKAGE_VERSION = '5.41.0';
+	const PACKAGE_VERSION = '5.41.1-alpha';
 	const PKG_DIR         = __DIR__ . '/../';
 	const BASE_DIR        = __DIR__ . '/';
 	const BASE_FILE       = __FILE__;

diff --git a/...ects/packages/jetpack-mu-wpcom/src/features/custom-css/csstidy/class.csstidy-optimise.php b/...ects/packages/jetpack-mu-wpcom/src/features/custom-css/csstidy/class.csstidy-optimise.php
@@ -632,12 +632,12 @@ public static function explode_ws( $sep, $string ) {
 	 * @see dissolve_4value_shorthands()
 	 */
 	public static function merge_4value_shorthands( $array ) {
-		$return     = $array;
+		$return     = is_array( $array ) ? $array : array();
 		$shorthands = & $GLOBALS['csstidy']['shorthands'];
 
 		foreach ( $shorthands as $key => $value ) {
-			if ( isset( $array[ $value[0] ] ) && isset( $array[ $value[1] ] )
-							&& isset( $array[ $value[2] ] ) && isset( $array[ $value[3] ] ) && $value !== 0 ) {
+			if ( $value !== 0 && isset( $array[ $value[0] ] ) && isset( $array[ $value[1] ] )
+							&& isset( $array[ $value[2] ] ) && isset( $array[ $value[3] ] ) ) {
 				$return[ $key ] = '';
 
 				$important = '';

diff --git a/projects/plugins/jetpack/changelog/fix-css-tidy-wraning b/projects/plugins/jetpack/changelog/fix-css-tidy-wraning
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Prevent PHP warning
+
+
diff --git a/projects/plugins/jetpack/modules/custom-css/csstidy/class.csstidy-optimise.php b/projects/plugins/jetpack/modules/custom-css/csstidy/class.csstidy-optimise.php
@@ -632,12 +632,12 @@ public static function explode_ws( $sep, $string ) {
 	 * @see dissolve_4value_shorthands()
 	 */
 	public static function merge_4value_shorthands( $array ) {
-		$return     = $array;
+		$return     = is_array( $array ) ? $array : array();
 		$shorthands = & $GLOBALS['csstidy']['shorthands'];
 
 		foreach ( $shorthands as $key => $value ) {
-			if ( isset( $array[ $value[0] ] ) && isset( $array[ $value[1] ] )
-							&& isset( $array[ $value[2] ] ) && isset( $array[ $value[3] ] ) && $value !== 0 ) {
+			if ( $value !== 0 && isset( $array[ $value[0] ] ) && isset( $array[ $value[1] ] )
+							&& isset( $array[ $value[2] ] ) && isset( $array[ $value[3] ] ) ) {
 				$return[ $key ] = '';
 
 				$important = '';