projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove Joomla-specific error handling
[civicrm-core.git]
/
CRM
/
Core
/
Error.php
diff --git
a/CRM/Core/Error.php
b/CRM/Core/Error.php
index ea1dc1d0e3b731a8b2786f985d996b20a25b9db8..e52e51515a22e94705dbb695b9903043718fb47d 100644
(file)
--- a/
CRM/Core/Error.php
+++ b/
CRM/Core/Error.php
@@
-466,17
+466,12
@@
class CRM_Core_Error extends PEAR_ErrorStack {
$template = CRM_Core_Smarty::singleton();
$template->assign($vars);
$content = $template->fetch('CRM/common/fatal.tpl');
$template = CRM_Core_Smarty::singleton();
$template->assign($vars);
$content = $template->fetch('CRM/common/fatal.tpl');
+
if ($config->backtrace) {
$content = self::formatHtmlException($exception) . $content;
}
if ($config->backtrace) {
$content = self::formatHtmlException($exception) . $content;
}
- if ($config->userFramework == 'Joomla' &&
- class_exists('JError')
- ) {
- JError::raiseError('CiviCRM-001', $content);
- }
- else {
- echo CRM_Utils_System::theme($content);
- }
+
+ echo CRM_Utils_System::theme($content);
// fin
self::abend(CRM_Core_Error::FATAL_ERROR);
// fin
self::abend(CRM_Core_Error::FATAL_ERROR);