Merge branch '3.1' into 3

Merge pull request #96 from dnadesign/fix/type-error-when-null
Make sureHtmlDiff::compareHTML is not passed null values
2024-02-15 11:15:35 +00:00 · 2024-02-13 11:55:45 +13:00 · 2024-02-13 11:43:41 +13:00
1 changed files with 2 additions and 2 deletions
--- a/src/VersionFeed.php
+++ b/src/VersionFeed.php
@ -97,7 +97,7 @@ class VersionFeed extends SiteTreeExtension
            if (isset($previous)) {
                // Produce the diff fields for use in the template.
                if ($version->Title != $previous->Title) {
-                    $diffTitle = HtmlDiff::compareHTML($version->Title, $previous->Title);
+                    $diffTitle = HtmlDiff::compareHTML($version->Title ?? '', $previous->Title ?? '');

                    $version->DiffTitle = DBField::create_field('HTMLText', null);
                    $version->DiffTitle->setValue(
@ -110,7 +110,7 @@ class VersionFeed extends SiteTreeExtension
                }

                if ($version->Content != $previous->Content) {
-                    $diffContent = HtmlDiff::compareHTML($version->Content, $previous->Content);
+                    $diffContent = HtmlDiff::compareHTML($version->Content ?? '', $previous->Content ?? '');

                    $version->DiffContent = DBField::create_field('HTMLText', null);
                    $version->DiffContent->setValue('<div>'.$diffContent.'</div>');
Author	SHA1	Message	Date
github-actions	331f9692cf	Merge branch '3.1' into 3	2024-02-15 11:15:35 +00:00
Guy Sartorelli	935e1dabc3	Merge pull request #96 from dnadesign/fix/type-error-when-null Make sureHtmlDiff::compareHTML is not passed null values	2024-02-13 11:55:45 +13:00
Alexandre Saelens	c10085c99e	FIX: Make sureHtmlDiff::compareHTML is not passed null values	2024-02-13 11:43:41 +13:00