Merge pull request #8729 from emteknetnz/bugfix/htmlvalue-getcontent

Ensure document is not falsey before attempting to clone it
silverstripe · Jan 28, 2019 · a589bcb · a589bcb
2 parents 1b63610 + d285529
commit a589bcb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/View/Parsers/HTMLValue.php b/src/View/Parsers/HTMLValue.php
@@ -35,7 +35,11 @@ abstract public function setContent($fragment);
      */
     public function getContent()
     {
-        $doc = clone $this->getDocument();
+        $document = $this->getDocument();
+        if (!$document) {
+            return '';
+        }
+        $doc = clone $document;
         $xp = new DOMXPath($doc);
 
         // If there's no body, the content is empty string

diff --git a/tests/php/View/Parsers/HTML4ValueTest.php b/tests/php/View/Parsers/HTML4ValueTest.php
@@ -80,4 +80,19 @@ public function testAttributeEscaping()
         $value->setContent('<a href="&quot;"></a>');
         $this->assertEquals('<a href="&quot;"></a>', $value->getContent(), "'\"' character is escaped");
     }
+
+    public function testGetContent()
+    {
+        $value = new HTML4Value();
+
+        $value->setContent('<p>This is valid</p>');
+        $this->assertEquals('<p>This is valid</p>', $value->getContent(), "Valid content is returned");
+
+        $value->setContent('<p?< This is not really valid but it will get parsed into something valid');
+        // can sometimes get a this state where HTMLValue->valid is false
+        // for instance if a content editor saves something really weird in a LiteralField
+        // we can manually get to this state via ->setInvalid()
+        $value->setInvalid();
+        $this->assertEquals('', $value->getContent(), "Blank string is returned when invalid");
+    }
 }