tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Ensure document is not falsey before attempting to clone it
This commit is contained in:
Maxime Rainville 2019-01-29 09:11:04 +13:00 committed by GitHub
commit a589bcb092
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/View/Parsers/HTMLValue.php
View File

@ -35,7 +35,11 @@ abstract class HTMLValue extends ViewableData
*/ */
public function getContent() public function getContent()
{ {
$doc = clone $this->getDocument(); $document = $this->getDocument();
if (!$document) {
return '';
}
$doc = clone $document;
$xp = new DOMXPath($doc); $xp = new DOMXPath($doc);
// If there's no body, the content is empty string // If there's no body, the content is empty string

15
tests/php/View/Parsers/HTML4ValueTest.php
View File

@ -80,4 +80,19 @@ class HTML4ValueTest extends SapphireTest
$value->setContent('<a href="&quot;"></a>'); $value->setContent('<a href="&quot;"></a>');
$this->assertEquals('<a href="&quot;"></a>', $value->getContent(), "'\"' character is escaped"); $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");
}
} }