Commit 25bfec9a authored by Kurucz István's avatar Kurucz István
Browse files

Issue #3289275: Drupal 10 compatibility

parent e4038390

redirect_after_logout.info.yml

+1 −2
Changes for redirect_after_logout.info.yml: 1 added line, 2 removed lines.
Original line number Diff line number Diff line 
name: Redirect After Logout

type: module

description: User redirect, after logout.

core: 8.x

core_version_requirement: ^8 || ^9

core_version_requirement: ^9 || ^10

configure: redirect_after_logout.settings

redirect_after_logout.module

+1 −1
Changes for redirect_after_logout.module: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ function redirect_after_logout_page_attachments(array &$attachments) { 
    $current_url = Url::fromRoute('<current>');

    $path = $current_url->getInternalPath();

    $path_args = explode('/', $path);

    if (!empty($path_args)) {

    if ($path_args !== FALSE) {

      $destination = implode('/', $path_args);

    }

    $response = new RedirectResponse($destination);

src/EventSubscriber/RedirectAfterLogoutSubscriber.php

+1 −1
Changes for src/EventSubscriber/RedirectAfterLogoutSubscriber.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ class RedirectAfterLogoutSubscriber implements EventSubscriberInterface { 


    $config = $this->configFactory->get('redirect_after_logout.settings');

    $logout_message = $config->get('message');

    if (empty($logout_message) || $destination->isExternal()) {

    if ($logout_message === '' || $destination->isExternal()) {

      $destination = $destination->toString();

    }

    else {

tests/src/Functional/SettingsTest.php

+2 −2
Changes for tests/src/Functional/SettingsTest.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ class SettingsTest extends TestBase { 
      ->fieldValueEquals('edit-redirect-after-logout-message', $redirect_after_logout_message);

    // Check configuration values.

    $config = $this->config('redirect_after_logout.settings');

    $this->assertEquals($redirect_after_logout_destination, $config->get('destination'));

    $this->assertEquals($redirect_after_logout_message, $config->get('message'));

    $this::assertEquals($redirect_after_logout_destination, $config->get('destination'));

    $this::assertEquals($redirect_after_logout_message, $config->get('message'));

  }



  /**