diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module index dcef317..165d3cb 100644 --- a/core/modules/dblog/dblog.module +++ b/core/modules/dblog/dblog.module @@ -11,6 +11,7 @@ * @see watchdog() */ +use Drupal\Component\Utility\MapArray; use Drupal\Core\Database\Database; /** @@ -131,7 +132,7 @@ function _dblog_get_message_types() { $types[] = $object->type; } - return $types; + return MapArray::copyValuesToKeys($types); } /** diff --git a/core/modules/dblog/lib/Drupal/dblog/Plugin/views/wizard/Watchdog.php b/core/modules/dblog/lib/Drupal/dblog/Plugin/views/wizard/Watchdog.php index 398b6a2..d8d4278 100644 --- a/core/modules/dblog/lib/Drupal/dblog/Plugin/views/wizard/Watchdog.php +++ b/core/modules/dblog/lib/Drupal/dblog/Plugin/views/wizard/Watchdog.php @@ -7,14 +7,14 @@ namespace Drupal\dblog\Plugin\views\wizard; -use Drupal\Component\Annotation\Plugin; +use Drupal\views\Annotation\ViewsWizard; use Drupal\Core\Annotation\Translation; use Drupal\views\Plugin\views\wizard\WizardPluginBase; /** * Defines a wizard for the watchdog table. * - * @Plugin( + * @ViewsWizard( * id = "watchdog", * module = "dblog", * base_table = "watchdog",