Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2226267 by yched: Improve default value handling of fields to be consistent (follow-up).

8.0.x
Nathaniel Catchpole 2014-06-25 13:38:29 +01:00
parent 2a4c2f6bf5
commit 234ed4f894
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/lib/Drupal/Core/Field/FieldDefinition.php
View File

@ -380,7 +380,7 @@ class FieldDefinition extends ListDataDefinition implements FieldDefinitionInter
*/
public function getDefaultValue(ContentEntityInterface $entity) {
// Allow custom default values function.
if (isset($this->definition['default_value_callback'])) {
if (!empty($this->definition['default_value_callback'])) {
$value = call_user_func($this->definition['default_value_callback'], $entity, $this);
}
else {
@ -396,9 +396,10 @@ class FieldDefinition extends ListDataDefinition implements FieldDefinitionInter
*
* If set, the callback overrides any set default value.
*
* @param string|array $callback
* The callback to invoke for getting the default value. The callback will
* be invoked with the following arguments:
* @param callable|null $callback
* The callback to invoke for getting the default value (pass NULL to unset
* a previously set callback). The callback will be invoked with the
* following arguments:
* - \Drupal\Core\Entity\ContentEntityInterface $entity
* The entity being created.
* - \Drupal\Core\Field\FieldDefinitionInterface $definition