Merge pull request #525 from MultinetInteractive/master

itssimple · web-flow · commit bad2dfe93bfb · 2024-04-09T07:55:19.000+02:00
v5.0.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [5.0.1](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.0.0...v5.0.1) (2024-04-09)
+
+
+### Bug Fixes
+
+* Some null handling that is deprecated in newer versions of PHP ([d89c27d](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/d89c27d1dcf6b245ff6fd982ebccdacc1a7a4527))
+
 ## [5.0.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v4.3.0...v5.0.0) (2024-04-08)
 
 
diff --git a/PLUGIN-CHECKSUM b/PLUGIN-CHECKSUM
@@ -1 +1 @@
-a8eda52c319500fecae0731cee509ae8
+e29b0dd069aa125c9c8fa6bd4860e8a0
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 ) {
diff --git a/eduadmin.php b/eduadmin.php
@@ -9,7 +9,7 @@
  * Plugin URI:	https://www.eduadmin.se
  * Description:	EduAdmin plugin to allow visitors to book courses at your website
  * Tags:	booking, participants, courses, events, eduadmin, lega online
- * Version:	5.0.0
+ * Version:	5.0.1
  * GitHub Plugin URI: multinetinteractive/eduadmin-wordpress
  * GitHub Plugin URI: https://github.com/multinetinteractive/eduadmin-wordpress
  * Requires at least: 6.0
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "eduadmin-wordpress-plugin",
 	"private": true,
-	"version": "5.0.0",
+	"version": "5.0.1",
 	"repository": "https://github.com/MultinetInteractive/EduAdmin-WordPress.git",
 	"author": "Chris Gårdenberg <chga@multinet.se>",
 	"license": "MIT",
diff --git a/readme.md b/readme.md
@@ -1,7 +1,7 @@
 # EduAdmin Booking
 - Requires at least: 6.0
 - Tested up to: 6.6
-- Stable tag: 5.0.0
+- Stable tag: 5.0.1
 - Requires PHP: 8.1
 - License: GPL3
 - License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
@@ -40,6 +40,13 @@ If you notice that your API key doesn't work any more, you have to contact us.
 
 The full changelog available on [GitHub](https://github.com/MultinetInteractive/EduAdmin-WordPress/blob/production/CHANGELOG.md)
 
+### [5.0.1](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.0.0...v5.0.1) (2024-04-09)
+
+
+#### Bug Fixes
+
+* Some null handling that is deprecated in newer versions of PHP ([d89c27d](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/d89c27d1dcf6b245ff6fd982ebccdacc1a7a4527))
+
 ### [5.0.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v4.3.0...v5.0.0) (2024-04-08)
 
 
@@ -70,12 +77,5 @@ The full changelog available on [GitHub](https://github.com/MultinetInteractive/
 
 * #[\ReturnTypeWillChange] instead of typing, because PHP is.. well PHP ([7684891](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/7684891ff6d55b58e186a2569d42674792e7f543))
 
-### [4.2.2](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v4.2.1...v4.2.2) (2024-01-10)
-
-
-#### Bug Fixes
-
-* More return types, because of silly deprecation notices. ([528d744](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/528d7441f64cd45de32fd599f6853a93c89a9489))
-
 
 
diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@ Contributors: mnchga
 Tags: booking, participants, courses, events, eduadmin, lega online
 Requires at least: 6.0
 Tested up to: 6.6
-Stable tag: 5.0.0
+Stable tag: 5.0.1
 Requires PHP: 8.1
 License: GPL3
 License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
@@ -45,6 +45,13 @@ If you notice that your API key doesn't work any more, you have to contact us.
 
 The full changelog available on [GitHub](https://github.com/MultinetInteractive/EduAdmin-WordPress/blob/production/CHANGELOG.md)
 
+### [5.0.1](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.0.0...v5.0.1) (2024-04-09)
+
+
+#### Bug Fixes
+
+* Some null handling that is deprecated in newer versions of PHP ([d89c27d](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/d89c27d1dcf6b245ff6fd982ebccdacc1a7a4527))
+
 ### [5.0.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v4.3.0...v5.0.0) (2024-04-08)
 
 
@@ -75,12 +82,5 @@ The full changelog available on [GitHub](https://github.com/MultinetInteractive/
 
 * #[\ReturnTypeWillChange] instead of typing, because PHP is.. well PHP ([7684891](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/7684891ff6d55b58e186a2569d42674792e7f543))
 
-### [4.2.2](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v4.2.1...v4.2.2) (2024-01-10)
-
-
-#### Bug Fixes
-
-* More return types, because of silly deprecation notices. ([528d744](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/528d7441f64cd45de32fd599f6853a93c89a9489))
-
 
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-a8eda52c319500fecae0731cee509ae8`
	`1`	`+e29b0dd069aa125c9c8fa6bd4860e8a0`
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 ) {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "eduadmin-wordpress-plugin",`
`3`	`3`	`"private": true,`
`4`		`- "version": "5.0.0",`
	`4`	`+ "version": "5.0.1",`
`5`	`5`	`"repository": "https://github.com/MultinetInteractive/EduAdmin-WordPress.git",`
`6`	`6`	`"author": "Chris Gårdenberg <chga@multinet.se>",`
`7`	`7`	`"license": "MIT",`