From ab00594e46271ab984fb04d9a8089402acae9f97 Mon Sep 17 00:00:00 2001 From: Octavian Cinciu Date: Fri, 10 May 2019 15:51:32 +0300 Subject: [PATCH] Check if the correct layout is used (#19485) --- components/com_users/helpers/legacyrouter.php | 2 +- components/com_users/helpers/route.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/com_users/helpers/legacyrouter.php b/components/com_users/helpers/legacyrouter.php index 68c995601b0a3..7e9609575d81f 100644 --- a/components/com_users/helpers/legacyrouter.php +++ b/components/com_users/helpers/legacyrouter.php @@ -106,7 +106,7 @@ public function build(&$query, &$segments) } // Check to see if we have found the login menu item. - if (empty($login) && $item->query['view'] === 'login') + if (empty($login) && $item->query['view'] === 'login' && (empty($item->query['layout']) || $item->query['layout'] === 'default')) { $login = $item->id; diff --git a/components/com_users/helpers/route.php b/components/com_users/helpers/route.php index 10de264776517..f59c4cbc8900e 100644 --- a/components/com_users/helpers/route.php +++ b/components/com_users/helpers/route.php @@ -61,7 +61,7 @@ public static function getLoginRoute() // Search for a suitable menu id. foreach ($items as $item) { - if (isset($item->query['view']) && $item->query['view'] === 'login') + if (isset($item->query['view']) && $item->query['view'] === 'login' && (empty($item->query['layout']) || $item->query['layout'] === 'default')) { return $item->id; }