diff --git a/module/finc/src/finc/Bootstrapper.php b/module/finc/src/finc/Bootstrapper.php index 05b4796ae9b3eb8239812cfb2d2f8ea989c057cb..178435297e4ca91185668a0ba6af1a8a02416fc5 100644 --- a/module/finc/src/finc/Bootstrapper.php +++ b/module/finc/src/finc/Bootstrapper.php @@ -74,7 +74,11 @@ class Bootstrapper extends \VuFind\Bootstrapper return; } - $exceptionArray = explode('\\', get_class($e->getParam('exception'))); + if ($exception instanceof \VuFindSearch\Backend\Exception\BackendException && $exception->getPrevious()) { + $exception = $exception->getPrevious(); + } + + $exceptionArray = explode('\\', get_class($exception)); $exceptionName = end( $exceptionArray ); @@ -90,7 +94,7 @@ class Bootstrapper extends \VuFind\Bootstrapper $model = new \Zend\View\Model\ViewModel( [ 'display_exceptions' => APPLICATION_ENV == 'development', - 'exception' => $e->getParam('exception'), + 'exception' => $e->getParam('exception'), ] ); $model->setTemplate($template); diff --git a/themes/finc/templates/error/RuntimeException.phtml b/themes/finc/templates/error/RuntimeException.phtml index 0e8933ecf5a1fd6c08db0c8152ad4ae3d42b05dc..949ab27f13ea71980dfb49962497f0c72683d996 100644 --- a/themes/finc/templates/error/RuntimeException.phtml +++ b/themes/finc/templates/error/RuntimeException.phtml @@ -14,7 +14,7 @@ <?php else: ?> <p><?=$this->transEsc($this->message)?></p> <?=$this->transEsc('Please contact the Library Reference Department for assistance')?> - <?php $supportEmail = $this->escapeHtmlAttr($this->systememail()); ?> + <?php $supportEmail = $this->escapeHtmlAttr($this->systemEmail()); ?> <a href="mailto:<?=$supportEmail?>"><?=$supportEmail?></a> <?php endif; ?> <br/> diff --git a/themes/finc/templates/error/TimeoutException.phtml b/themes/finc/templates/error/TimeoutException.phtml index 825b115fa32be971509d5288848b43123d394367..70da72eacaf59df2a23c950fa8b096ea6f92a026 100644 --- a/themes/finc/templates/error/TimeoutException.phtml +++ b/themes/finc/templates/error/TimeoutException.phtml @@ -8,7 +8,7 @@ ?> <div class="alert alert-danger"> <p> - <?=sprintf($this->translate('error_timeout'), $this->systememail(), $this->systememail())?> + <?=sprintf($this->translate('error_timeout'), $this->systemEmail(), $this->systemEmail())?> <br/> </p> </div>