Issue #2205367 by sun, Berdir: [HEAD BROKEN] PHP 5.4.

8.0.x
Alex Pott 2014-02-26 09:40:38 +00:00
parent f6e6e52871
commit d1bbfa74e6
1 changed files with 9 additions and 9 deletions

View File

@ -25,7 +25,7 @@ use Drupal\entity\EntityDisplayBase;
* }
* )
*/
class EntityFormDisplay extends EntityDisplayBase implements EntityFormDisplayInterface, \Serializable {
class EntityFormDisplay extends EntityDisplayBase implements EntityFormDisplayInterface {
/**
* {@inheritdoc}
@ -148,20 +148,20 @@ class EntityFormDisplay extends EntityDisplayBase implements EntityFormDisplayIn
/**
* {@inheritdoc}
*/
public function serialize() {
public function __sleep() {
// Only store the definition, not external objects or derived data.
$data = $this->getExportProperties() + array('entityType' => $this->getEntityTypeId());
return serialize($data);
$keys = array_keys($this->getExportProperties());
$keys[] = 'entityTypeId';
return $keys;
}
/**
* {@inheritdoc}
*/
public function unserialize($serialized) {
$data = unserialize($serialized);
$entity_type = $data['entityType'];
unset($data['entityType']);
$this->__construct($data, $entity_type);
public function __wakeup() {
// Run the values from getExportProperties() through __construct().
$values = array_intersect_key($this->getExportProperties(), get_object_vars($this));
$this->__construct($values, $this->entityTypeId);
}
}