diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimeDefaultFormatter.php b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimeDefaultFormatter.php index 41b20f2..6c26175 100644 --- a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimeDefaultFormatter.php +++ b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimeDefaultFormatter.php @@ -102,7 +102,7 @@ public function settingsForm(array $form, array &$form_state) { $time = new DrupalDateTime(); $format_types = \Drupal::entityManager() ->getStorageController('date_format') - ->load(); + ->loadMultiple(); foreach ($format_types as $type => $type_info) { $options[$type] = $type_info->label() . ' (' . format_date($time->format('U'), $type) . ')'; } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php index f172d0e..bb90061 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php @@ -42,7 +42,7 @@ function setUp() { ->save(); $formats = $this->container->get('plugin.manager.entity') ->getStorageController('date_format') - ->load(array('long', 'medium', 'short')); + ->loadMultiple(array('long', 'medium', 'short')); $formats['long']->setPattern('l, j. F Y - G:i')->save(); $formats['medium']->setPattern('j. F Y - G:i')->save(); $formats['short']->setPattern('Y M j - g:ia')->save(); diff --git a/core/modules/system/lib/Drupal/system/Tests/Datetime/DateTimePlusIntlTest.php b/core/modules/system/lib/Drupal/system/Tests/Datetime/DateTimePlusIntlTest.php index 6316b19..89466d4 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Datetime/DateTimePlusIntlTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Datetime/DateTimePlusIntlTest.php @@ -78,7 +78,7 @@ function testDateTimestampIntl() { $default_formats = $this->container->get('plugin.manager.entity') ->getStorageController('date_format') - ->load(); + ->loadMultiple(); foreach ($default_formats as $format) { $php_format = $php_date->format($format->getPattern(DrupalDateTime::PHP), $php_settings); diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc index 47c7ff8..0413128 100644 --- a/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -1376,7 +1376,7 @@ function system_date_format_localize_form($form, &$form_state, $langcode) { // Get list of available formats. $formats = Drupal::entityManager() ->getStorageController('date_format') - ->load(); + ->loadMultiple(); $choices = array(); foreach ($formats as $date_format_id => $format_info) { // Ignore values that are localized. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php index 7e30140..ff2203a 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php @@ -33,7 +33,7 @@ public function buildOptionsForm(&$form, &$form_state) { $date_formats = array(); $date_types = \Drupal::entityManager() ->getStorageController('date_format') - ->load(); + ->loadMultiple(); foreach ($date_types as $machine_name => $value) { $date_formats[$machine_name] = t('@name format: @date', array('@name' => $value->label(), '@date' => format_date(REQUEST_TIME, $machine_name))); }