diff --git a/core/lib/Drupal/Core/Field/PluginSettingsBase.php b/core/lib/Drupal/Core/Field/PluginSettingsBase.php index 5b72033..c35d03b 100644 --- a/core/lib/Drupal/Core/Field/PluginSettingsBase.php +++ b/core/lib/Drupal/Core/Field/PluginSettingsBase.php @@ -8,7 +8,6 @@ namespace Drupal\Core\Field; use Drupal\Core\Plugin\PluginBase; -use Drupal\Component\Plugin\Factory\DefaultFactory; /** * Base class for the Field API plugins. @@ -71,25 +70,13 @@ public function getSetting($key) { * Merges default settings values into $settings. */ protected function mergeDefaults() { - $this->settings += $this->getDefaultSettings(); + $this->settings += static::settings(); $this->defaultSettingsMerged = TRUE; } /** * {@inheritdoc} */ - public function getDefaultSettings() { - $definition = $this->getPluginDefinition(); - if (!empty($plugin_definition['class'])) { - $plugin_class = DefaultFactory::getPluginClass($this->getPluginId(), $definition); - return $plugin_class::settings(); - } - return array(); - } - - /** - * {@inheritdoc} - */ public function setSettings(array $settings) { $this->settings = $settings; $this->defaultSettingsMerged = FALSE; diff --git a/core/lib/Drupal/Core/Field/PluginSettingsInterface.php b/core/lib/Drupal/Core/Field/PluginSettingsInterface.php index e33c57d..8b588ec 100644 --- a/core/lib/Drupal/Core/Field/PluginSettingsInterface.php +++ b/core/lib/Drupal/Core/Field/PluginSettingsInterface.php @@ -50,14 +50,6 @@ public function getSettings(); public function getSetting($key); /** - * Returns the default settings for the plugin. - * - * @return array - * The array of default setting values, keyed by setting names. - */ - public function getDefaultSettings(); - - /** * Sets the settings for the plugin. * * @param array $settings