Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / options / options.module

diff --git a/web/core/modules/options/options.module b/web/core/modules/options/options.module
index 7cf36355293dd735fb1ef33dd9636779afef0136..c4ebf84f8371f1423bf96067771ec6bd3323a329 100644 (file)
--- a/web/core/modules/options/options.module
+++ b/web/core/modules/options/options.module
@@ -122,8 +122,7 @@ function options_field_storage_config_update_forbid(FieldStorageConfigInterface
  */
 function _options_values_in_use($entity_type, $field_name, $values) {
   if ($values) {
-    $factory = \Drupal::service('entity.query');
-    $result = $factory->get($entity_type)
+    $result = \Drupal::entityQuery($entity_type)
       ->condition($field_name . '.value', $values, 'IN')
       ->count()
       ->accessCheck(FALSE)