Fix problems causing fatal errors in the recent release. (#38114)

* Added safeguards against null body class. * Changelog. * Infinite Scroll: added safeguards against non-initialized Sharing module. * Changelog. * Fix fatals when attributes are not an array. * Project versions. * Update projects/plugins/jetpack/modules/infinite-scroll/infinity.php Co-authored-by: Brad Jorsch <[email protected]> * Remove unneeded precautions. --------- Co-authored-by: Brad Jorsch <[email protected]>
Automattic · Jun 28, 2024 · affec6d · affec6d
1 parent 02c6fc3
commit affec6d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/projects/plugins/jetpack/changelog/fix-woa-fatals b/projects/plugins/jetpack/changelog/fix-woa-fatals
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Infinite Scroll: fixed a fatal error from uninitialized Sharing module.
diff --git a/projects/plugins/jetpack/modules/infinite-scroll/infinity.php b/projects/plugins/jetpack/modules/infinite-scroll/infinity.php
@@ -1545,6 +1545,11 @@ public function query() {
 					sharing_register_post_for_share_counts( get_the_ID() );
 				}
 
+				// If sharing counts are not initialized for any reason, we initialize them here.
+				if ( ! is_array( $jetpack_sharing_counts ) ) {
+					$jetpack_sharing_counts = array();
+				}
+
 				$results['postflair'] = array_flip( $jetpack_sharing_counts );
 			}
 		} else {

diff --git a/projects/plugins/jetpack/modules/markdown/easy-markdown.php b/projects/plugins/jetpack/modules/markdown/easy-markdown.php
@@ -480,6 +480,12 @@ public function wp_kses_allowed_html( $tags, $context ) {
 
 		$re = '/' . $this->get_parser()->contain_span_tags_re . '/';
 		foreach ( $tags as $tag => $attributes ) {
+
+			// In case other filters have changed the value to a non-array, we skip it.
+			if ( ! is_array( $attributes ) ) {
+				continue;
+			}
+
 			if ( preg_match( $re, $tag ) ) {
 				$attributes['markdown'] = true;
 				$tags[ $tag ]           = $attributes;

diff --git a/projects/plugins/wpcomsh/changelog/fix-woa-fatals b/projects/plugins/wpcomsh/changelog/fix-woa-fatals
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Wpcomsh: fixed fatal errors in case of null body class values.
diff --git a/projects/plugins/wpcomsh/custom-colors/colors.php b/projects/plugins/wpcomsh/custom-colors/colors.php
@@ -400,7 +400,7 @@ public static function register_scripts_and_styles() {
 	 * @param array $classes the array of classes to add custom class to.
 	 */
 	public static function body_class( $classes ) {
-		array_push( $classes, 'custom-colors' );
+		$classes[] = 'custom-colors';
 		return $classes;
 	}