diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php index b820f27..44e147c 100644 --- a/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php +++ b/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php @@ -272,7 +272,7 @@ function _testBasicCommentRdfaMarkup($graph, $comment, $account = array()) { // Comment body. $expected_value = array( 'type' => 'literal', - 'value' => $comment->comment_body->processed, + 'value' => $comment->comment_body->value . "\n", 'lang' => 'en', ); $this->assertTrue($graph->hasProperty($comment_uri, 'http://purl.org/rss/1.0/modules/content/encoded', $expected_value), 'Comment body found in RDF output (content:encoded).'); diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php index d935a3f..f4d2eb8 100644 --- a/core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php +++ b/core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php @@ -462,7 +462,10 @@ protected function assertRdfaNodeCommentProperties($graph) { $text = $this->articleComment->get('comment_body')->offsetGet(0)->get('value')->getValue(); $expected_value = array( 'type' => 'literal', - 'value' => $text, + // There is an extra carriage return in the when parsing comments as + // output by Bartik, so it must be added to the expected value. + 'value' => "$text +", 'lang' => 'en', ); $this->assertTrue($graph->hasProperty($this->articleCommentUri, 'http://schema.org/text', $expected_value), 'Article comment body was found (schema:text).'); diff --git a/core/modules/text/lib/Drupal/text/TextProcessed.php b/core/modules/text/lib/Drupal/text/TextProcessed.php index 6f2c65c..69c9f91 100644 --- a/core/modules/text/lib/Drupal/text/TextProcessed.php +++ b/core/modules/text/lib/Drupal/text/TextProcessed.php @@ -48,7 +48,7 @@ public function getValue($langcode = NULL) { $item = $this->getParent(); $text = $item->{($this->definition['settings']['text source'])}; - if ($item->getFieldDefinition()->getFieldSetting('text_processing') && $item->format) { + if ($item->getFieldDefinition()->getFieldSetting('text_processing')) { // @todo: The entity language might not be the correct language to use, // fix in https://drupal.org/node/2061331. $entity = $item->getParent()->getParent();