From 9d735153b18b7064482191de8a491355cb41f292 Mon Sep 17 00:00:00 2001 From: Brian Shaughnessy Date: Mon, 7 Apr 2014 10:31:53 -0400 Subject: [PATCH] CRM-14208 additional includes for J3.2.1+ --- CRM/Utils/System/Joomla.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CRM/Utils/System/Joomla.php b/CRM/Utils/System/Joomla.php index 4db4125cf1..1cdb100697 100644 --- a/CRM/Utils/System/Joomla.php +++ b/CRM/Utils/System/Joomla.php @@ -519,6 +519,13 @@ class CRM_Utils_System_Joomla extends CRM_Utils_System_Base { } else { if (!JUserHelper::verifyPassword($password, $dbPassword, $dbId)) return FALSE; + + //include additional files required by Joomla 3.2.1+ + if ( version_compare(JVERSION, '3.2.1', 'ge') ) { + require $joomlaBase . '/libraries/cms/application/helper.php'; + require $joomlaBase . '/libraries/cms/application/cms.php'; + require $joomlaBase . '/libraries/cms/application/administrator.php'; + } } CRM_Core_BAO_UFMatch::synchronizeUFMatch($row, $dbId, $dbEmail, 'Joomla'); -- 2.25.1