X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FSystem%2FJoomla.php;h=746ef630ecee9b17217ca3eb084295a5a36d292e;hb=30a3000cc63f6d8858943fc61afa98ec123b60aa;hp=030b73cc6c80bf3d1c24c286d2537d71876307ad;hpb=fb530290dc4cfa5c71e5b4e3fdd851f96f48c727;p=civicrm-core.git diff --git a/CRM/Utils/System/Joomla.php b/CRM/Utils/System/Joomla.php index 030b73cc6c..746ef630ec 100644 --- a/CRM/Utils/System/Joomla.php +++ b/CRM/Utils/System/Joomla.php @@ -265,8 +265,12 @@ class CRM_Utils_System_Joomla extends CRM_Utils_System_Base { if ($config->userFrameworkFrontend) { $script = 'index.php'; - if (JRequest::getVar("Itemid") && (strpos($path, 'civicrm/payment/ipn') === FALSE)) { - $Itemid = "{$separator}Itemid=" . JRequest::getVar("Itemid"); + + // Get Itemid using JInput::get() + $input = Joomla\CMS\Factory::getApplication()->input; + $itemIdNum = $input->get("Itemid"); + if ($itemIdNum && (strpos($path, 'civicrm/payment/ipn') === FALSE)) { + $Itemid = "{$separator}Itemid=" . $itemIdNum; } } @@ -833,23 +837,6 @@ class CRM_Utils_System_Joomla extends CRM_Utils_System_Base { } } - /** - * Output code from error function. - * @param string $content - */ - public function outputError($content) { - if (class_exists('JErrorPage')) { - $error = new Exception($content); - JErrorPage::render($error); - } - elseif (class_exists('JError')) { - JError::raiseError('CiviCRM-001', $content); - } - else { - parent::outputError($content); - } - } - /** * @inheritDoc */