diff --git a/core/lib/Drupal/Core/Entity/EntityBCDecorator.php b/core/lib/Drupal/Core/Entity/EntityBCDecorator.php index c8911bd..9f77649 100644 --- a/core/lib/Drupal/Core/Entity/EntityBCDecorator.php +++ b/core/lib/Drupal/Core/Entity/EntityBCDecorator.php @@ -15,7 +15,7 @@ * Implements a decorator providing backwards compatible entity field access. * * Allows using entities converted to the new Entity Field API with the Drupal 7 - * way of accessing ways fields or properties. + * way of accessing fields or properties. * * Note: We access the protected 'values' and 'fields' properties of the entity * via the magic getter - which returns them by reference for us. We do so, as @@ -251,7 +251,7 @@ public function bundle() { * Forwards the call to the decorated entity. */ public function label($langcode = NULL) { - return $this->decorated->label(); + return $this->decorated->label($langcode); } /** @@ -300,7 +300,7 @@ public function getRevisionId() { * Forwards the call to the decorated entity. */ public function isDefaultRevision($new_value = NULL) { - return $this->decorated->isDefaultRevision(); + return $this->decorated->isDefaultRevision($new_value); } /** diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php index e0e66bf..4e3b101 100644 --- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php +++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php @@ -2076,9 +2076,9 @@ protected function createTypedData($definition, $value = NULL, $context = array( // Assert the definition of the wrapper. $this->assertTrue($data instanceof \Drupal\Core\TypedData\TypedDataInterface, 'Typed data object is an instance of the typed data interface.'); $definition = $data->getDefinition(); - $this->assertTrue(!empty($definition['type']), $definition['type'] . ' data definition was returned.'); + $this->assertTrue(!empty($definition['type']), format_string('!type data definition was returned.', array('!type' => $definition['type']))); // Assert that the correct type was constructed. - $this->assertEqual($data->getType(), $type, $definition['type'] . ' object returned type.'); + $this->assertEqual($data->getType(), $type, format_string('!type object returned type.', array('!type' => $definition['type']))); return $data; }