fix: Some null handling that is deprecated in newer versions of PHP

Chris Gårdenberg · Chris Gårdenberg · commit d89c27d1dcf6 · 2024-04-09T07:16:31.000+02:00
diff --git a/PLUGIN-CHECKSUM b/PLUGIN-CHECKSUM
@@ -1 +1 @@
-a8eda52c319500fecae0731cee509ae8
+19e1da41df793f66c4cb9a74dcbb9581
diff --git a/content/template/listTemplate/blocks/course-block-a.php b/content/template/listTemplate/blocks/course-block-a.php
@@ -24,10 +24,12 @@
 			}
 
 			if ( $show_descr ) {
-				echo '<div class="courseDescription">' . wp_kses( $descr, array(
-						'br' => array(),
-						'p'  => array(),
-					) ) . '</div>';
+				if ( $descr != null ) {
+					echo '<div class="courseDescription">' . wp_kses( $descr, array(
+							'br' => array(),
+							'p'  => array(),
+						) ) . '</div>';
+				}
 			}
 
 			if ( $show_course_locations && ! empty( $event_cities ) && $show_city ) {
diff --git a/content/template/listTemplate/blocks/course-block-b.php b/content/template/listTemplate/blocks/course-block-b.php
@@ -18,14 +18,20 @@
 				}
 			}
 		} else {
-			$descr = strip_tags( $object[ $descr_field ] );
+			if ( $object[ $descr_field ] != null ) {
+				$descr = strip_tags( $object[ $descr_field ] );
+			} else {
+				$descr = null;
+			}
 		}
 
 		if ( $show_descr ) {
-			echo '<div class"courseDescription">' . wp_kses( $descr, array(
-					'br' => array(),
-					'p'  => array(),
-				) ) . '</div>';
+			if ( $descr != null ) {
+				echo '<div class"courseDescription">' . wp_kses( $descr, array(
+						'br' => array(),
+						'p'  => array(),
+					) ) . '</div>';
+			}
 		}
 
 		if ( $show_course_locations && ! empty( $event_cities ) && $show_city ) {

Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,20 @@`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`	`} else {`
`21`		`- $descr = strip_tags( $object[ $descr_field ] );`
	`21`	`+ if ( $object[ $descr_field ] != null ) {`
	`22`	`+ $descr = strip_tags( $object[ $descr_field ] );`
	`23`	`+ } else {`
	`24`	`+ $descr = null;`
	`25`	`+ }`
`22`	`26`	`}`
`23`	`27`
`24`	`28`	`if ( $show_descr ) {`
`25`		`- echo '<div class"courseDescription">' . wp_kses( $descr, array(`
`26`		`- 'br' => array(),`
`27`		`- 'p' => array(),`
`28`		`- ) ) . '</div>';`
	`29`	`+ if ( $descr != null ) {`
	`30`	`+ echo '<div class"courseDescription">' . wp_kses( $descr, array(`
	`31`	`+ 'br' => array(),`
	`32`	`+ 'p' => array(),`
	`33`	`+ ) ) . '</div>';`
	`34`	`+ }`
`29`	`35`	`}`
`30`	`36`
`31`	`37`	`if ( $show_course_locations && ! empty( $event_cities ) && $show_city ) {`