From 8421b5029b78352392c50b334a7693d2c23b9f79 Mon Sep 17 00:00:00 2001 From: andrewpthompson Date: Tue, 30 Jan 2018 12:01:56 +1030 Subject: [PATCH] CRM-21203 revisited Joomla 3.8 cron/cli extra fixes --- CRM/Utils/System/Joomla.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/CRM/Utils/System/Joomla.php b/CRM/Utils/System/Joomla.php index 526438f4df..b2d4e2b714 100644 --- a/CRM/Utils/System/Joomla.php +++ b/CRM/Utils/System/Joomla.php @@ -557,7 +557,6 @@ class CRM_Utils_System_Joomla extends CRM_Utils_System_Base { define('DS', DIRECTORY_SEPARATOR); define('JPATH_BASE', $joomlaBase . '/administrator'); require $joomlaBase . '/administrator/includes/defines.php'; - require $joomlaBase . '/administrator/includes/framework.php'; } // Get the framework. @@ -565,20 +564,26 @@ class CRM_Utils_System_Joomla extends CRM_Utils_System_Base { require $joomlaBase . '/libraries/import.legacy.php'; } require $joomlaBase . '/libraries/cms.php'; - require $joomlaBase . '/libraries/import.php'; - require $joomlaBase . '/libraries/joomla/event/dispatcher.php'; - require_once $joomlaBase . '/configuration.php'; self::getJVersion($joomlaBase); + if (version_compare(JVERSION, '3.8', 'lt')) { + require $joomlaBase . '/libraries/import.php'; + require $joomlaBase . '/libraries/joomla/event/dispatcher.php'; + } + + require_once $joomlaBase . '/configuration.php'; + if (version_compare(JVERSION, '3.0', 'lt')) { require $joomlaBase . '/libraries/joomla/environment/uri.php'; require $joomlaBase . '/libraries/joomla/application/component/helper.php'; } - else { + elseif (version_compare(JVERSION, '3.8', 'lt')) { jimport('joomla.environment.uri'); } - jimport('joomla.application.cli'); + if (version_compare(JVERSION, '3.8', 'lt')) { + jimport('joomla.application.cli'); + } if (!defined('JDEBUG')) { define('JDEBUG', FALSE); -- 2.25.1