5f2fb9b Fix exception parameters. diff --git a/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php b/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php index 40e2cbd..2b32df3 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php +++ b/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php @@ -125,7 +125,7 @@ protected function initializeView($match = NULL, $match_operator = 'CONTAINS', $ // Check that the view is valid and the display still exists. $this->view = views_get_view($view_name); if (!$this->view || !$this->view->access($display_name)) { - throw new \RuntimeException('The view %view_name is no longer eligible for the %field_name field.', array('%view_name' => $view_name, '%field_name' => $this->instance['label'])); + throw new \RuntimeException(t('The view %view_name is no longer eligible for the %field_name field.', array('%view_name' => $view_name, '%field_name' => $this->instance['label']))); } $this->view->setDisplay($display_name); cacdb4b Even more HEAD chasing (#1479454). diff --git a/core/modules/user/lib/Drupal/user/Plugin/entity_reference/selection/UserSelection.php b/core/modules/user/lib/Drupal/user/Plugin/entity_reference/selection/UserSelection.php index ae98b08..598a848 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/entity_reference/selection/UserSelection.php +++ b/core/modules/user/lib/Drupal/user/Plugin/entity_reference/selection/UserSelection.php @@ -69,7 +69,7 @@ public static function settingsForm(&$field, &$instance) { '#type' => 'checkboxes', '#title' => t('Restrict to the selected roles'), '#required' => TRUE, - '#options' => user_roles(TRUE), + '#options' => user_role_names(TRUE), '#default_value' => $instance['settings']['handler_settings']['filter']['role'], ); }