From eb634ae4ac2cc1b2208d0fd130c6183cf36a7826 Mon Sep 17 00:00:00 2001 From: larssandergreen Date: Sun, 2 Jul 2023 13:21:31 -0600 Subject: [PATCH] Fix Joomla permissions warning --- CRM/Core/Permission/Joomla.php | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/CRM/Core/Permission/Joomla.php b/CRM/Core/Permission/Joomla.php index 1a3e333e40..1be3a31d63 100644 --- a/CRM/Core/Permission/Joomla.php +++ b/CRM/Core/Permission/Joomla.php @@ -53,23 +53,13 @@ class CRM_Core_Permission_Joomla extends CRM_Core_Permission_Base { // not execute hooks if joomla is not loaded if (defined('_JEXEC')) { $user = JFactory::getUser($userId); - $api_key = CRM_Utils_Request::retrieve('api_key', 'String', $store, FALSE, NULL, 'REQUEST'); + $api_key = CRM_Utils_Request::retrieve('api_key', 'String'); // If we are coming from REST we don't have a user but we do have the api_key for a user. if ($user->id === 0 && !is_null($api_key)) { - // This is a codeblock copied from /Civicrm/Utils/REST - $uid = NULL; - if (!$uid) { - $store = NULL; - - $contact_id = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $api_key, 'id', 'api_key'); - - if ($contact_id) { - $uid = CRM_Core_BAO_UFMatch::getUFId($contact_id); - } - $user = JFactory::getUser($uid); - - } + $contact_id = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $api_key, 'id', 'api_key'); + $uid = ($contact_id) ? CRM_Core_BAO_UFMatch::getUFId($contact_id) : NULL; + $user = JFactory::getUser($uid); } return $user->authorise($translated[0], $translated[1]); -- 2.25.1