diff --git a/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/Field.php b/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/Field.php index 6199e3e..262781c 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/Field.php +++ b/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/Field.php @@ -446,7 +446,7 @@ public function getSchema() { $schema += array('columns' => array(), 'indexes' => array(), 'foreign keys' => array()); // Check that the schema does not include forbidden column names. - if (array_intersect(array_keys($schema['columns']), $this->field_reserved_columns())) { + if (array_intersect(array_keys($schema['columns']), static::getReservedColumns())) { throw new FieldException('Illegal field type columns.'); } @@ -568,7 +568,7 @@ public function unserialize($serialized) { * * @return array */ - public static function field_reserved_columns() { + public static function getReservedColumns() { return array('deleted'); } diff --git a/core/modules/field_sql_storage/field_sql_storage.module b/core/modules/field_sql_storage/field_sql_storage.module index d2dd30d..dcbe476 100644 --- a/core/modules/field_sql_storage/field_sql_storage.module +++ b/core/modules/field_sql_storage/field_sql_storage.module @@ -94,7 +94,7 @@ function _field_sql_storage_revision_tablename($field) { * unique among all other fields. */ function _field_sql_storage_columnname($name, $column) { - return in_array($column, Field::field_reserved_columns()) ? $column : $name . '_' . $column; + return in_array($column, Field::getReservedColumns()) ? $column : $name . '_' . $column; } /** diff --git a/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Tables.php b/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Tables.php index 12fd42e..11aebc0 100644 --- a/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Tables.php +++ b/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Tables.php @@ -119,7 +119,7 @@ function addField($field, $type, $langcode) { if ($key < $count) { $next = $specifiers[$key + 1]; // Is this a field column? - if (isset($field['columns'][$next]) || in_array($next, Field::field_reserved_columns())) { + if (isset($field['columns'][$next]) || in_array($next, Field::getReservedColumns())) { // Use it. $column = $next; // Do not process it again.