From 95e86a0e3cabe72ad4161f671dc2383c5406f3e6 Mon Sep 17 00:00:00 2001
From: "Donald A. Lobo" <lobo@civicrm.org>
Date: Wed, 6 Nov 2013 09:07:35 -0800
Subject: [PATCH] CRM-13714 - Display fatal error for Joomla 3.x

http://issues.civicrm.org/jira/browse/CRM-13714
---
 CRM/Core/Error.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/CRM/Core/Error.php b/CRM/Core/Error.php
index 4f8b855a2a..169fe6d188 100644
--- a/CRM/Core/Error.php
+++ b/CRM/Core/Error.php
@@ -319,11 +319,16 @@ 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' && class_exists('JError')) {
-      JError::raiseError('CiviCRM-001', $content);
-    }
-    else {
-      echo CRM_Utils_System::theme($content);
+    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);
+      }
     }
 
     self::abend(CRM_Core_Error::FATAL_ERROR);
-- 
2.25.1