diff --git a/core/core.services.yml b/core/core.services.yml index 20b8651..8a008d8 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -117,7 +117,7 @@ services: class: Drupal\Core\Form\FormBuilder arguments: ['@module_handler', '@keyvalue.expirable', '@event_dispatcher', '@url_generator', '@string_translation', '@?csrf_token', '@?http_kernel'] calls: - - [setRequest, ['@?request']] + - [setRequest, ['@?request=']] keyvalue: class: Drupal\Core\KeyValueStore\KeyValueFactory arguments: ['@service_container', '@settings'] @@ -205,6 +205,7 @@ services: request: class: Symfony\Component\HttpFoundation\Request synthetic: true + synchronized: true event_dispatcher: class: Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher arguments: ['@service_container'] diff --git a/core/includes/session.inc b/core/includes/session.inc index 002d8dc..e7f7cf1 100644 --- a/core/includes/session.inc +++ b/core/includes/session.inc @@ -244,7 +244,7 @@ function drupal_session_initialize() { $is_https = \Drupal::request()->isSecure(); $cookies = \Drupal::request()->cookies; - if ($cookies->has(session_name()) || ($is_https && settings()->get('mixed_mode_sessions', FALSE) && $cookies->has(substr(session_name(), 1)))) { + if ($cookies->get(session_name()) || ($is_https && settings()->get('mixed_mode_sessions', FALSE) && $cookies->get(substr(session_name(), 1)))) { // If a session cookie exists, initialize the session. Otherwise the // session is only started on demand in drupal_session_commit(), making // anonymous users not use a session cookie unless something is stored in