From: Donald A. Lobo <lobo@civicrm.org>
Date: Thu, 14 Nov 2013 16:51:14 +0000 (-0800)
Subject: CRM-13714 - use joomla 3.x to render error template - title still buggy
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e8cd958c8bbadc82de081a0b2770e8c415acc5b9;p=civicrm-core.git

CRM-13714 - use joomla 3.x to render error template - title still buggy

----------------------------------------
* CRM-13714: Display fatal error for Joomla 3.x
  http://issues.civicrm.org/jira/browse/CRM-13714
---

diff --git a/CRM/Core/Error.php b/CRM/Core/Error.php
index b32da1445f..68383a0e86 100644
--- a/CRM/Core/Error.php
+++ b/CRM/Core/Error.php
@@ -319,16 +319,14 @@ class CRM_Core_Error extends PEAR_ErrorStack {
     CRM_Core_Error::debug_var('Fatal Error Details', $vars);
     CRM_Core_Error::backtrace('backTrace', TRUE);
     $content = $template->fetch($config->fatalErrorTemplate);
-    if ($config->userFramework == 'Joomla') {
-      // JErrorPage exists only in 3.1.x
-      // a bit ugly hack, but want this in for 4.4.1
-      // CRM-13714
-      if (class_exists('JError') && !class_exists('JErrorPage')) {
-        JError::raiseError('CiviCRM-001', $content);
-      }
-      else {
-        echo CRM_Utils_System::theme($content);
-      }
+    // JErrorPage exists only in 3.x and not 2.x
+    // CRM-13714
+    if ($config->userFramework == 'Joomla' && class_exists('JErrorPage')) {
+      $error = new Exception($content);
+      JErrorPage::render($error);
+    }
+    else if ($config->userFramework == 'Joomla' && class_exists('JError')) {
+      JError::raiseError('CiviCRM-001', $content);
     }
     else {
       echo CRM_Utils_System::theme($content);