Merge pull request #712 from localgovdrupal/3.x

3.0.5 release
localgovdrupal · May 21, 2024 · f8d64ef · f8d64ef
2 parents ccae132 + 734c0af
commit f8d64ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     ],
     "require": {
         "drupal/admin_toolbar": "^3.0",
-        "drupal/content_lock": "^2.3",
+        "drupal/content_lock": "^2.4",
         "drupal/core": "^10.0",
         "drupal/gin": "^3.0@alpha",
         "drupal/gin_login": "^2.0.3",
@@ -57,9 +57,6 @@
             "drupal/core": "-p2"
         },
         "patches": {
-	    "drupal/content_lock": {
-                "Fix PHP 8.2 deprecation notices": "https://www.drupal.org/files/issues/2023-05-22/3343964-5.patch"
-            },
             "drupal/core": {
                 "Users can't reference unpublished content even when they have access to it. See https://www.drupal.org/project/drupal/issues/2845144": "https://www.drupal.org/files/issues/2024-02-13/2845144-87.patch"
             }

diff --git a/modules/localgov_login_redirect/localgov_login_redirect.module b/modules/localgov_login_redirect/localgov_login_redirect.module
@@ -20,7 +20,7 @@ function localgov_login_redirect_user_login(AccountInterface $account) {
 
   // Check user is using a login link.
   $current_route = Drupal::routeMatch()->getRouteName();
-  if (in_array($current_route, ['user.reset', 'user.reset.login'])) {
+  if (in_array($current_route, ['user.reset', 'user.reset.login'], TRUE)) {
     return;
   }