Fixed bug #12092 (Follow-up to bug #9355): The errorhandling can make TYPO3 Backend...
[Packages/TYPO3.CMS.git] / typo3 / sysext / cms / tslib / index_ts.php
index 9693a7e..3d4b175 100644 (file)
@@ -132,10 +132,12 @@ $TT->pull();
 // *********************
 if ($TYPO3_CONF_VARS['SC_OPTIONS']['errors']['exceptionHandler'] !== '') {
        $TT->push('Register Exceptionhandler', '');
+       if ($TYPO3_CONF_VARS['SYS']['errorHandler'] !== '') {
                $errorHandler = t3lib_div::makeInstance($TYPO3_CONF_VARS['SYS']['errorHandler']);
                        // register an error handler for the given exceptionalErrors
                $errorHandler->setErrorHandlerForExceptionalErrors($TYPO3_CONF_VARS['SC_OPTIONS']['errors']['exceptionalErrors']);
-               $exceptionHandler = t3lib_div::makeInstance($TYPO3_CONF_VARS['SC_OPTIONS']['errors']['exceptionHandler']);
+       }
+       $exceptionHandler = t3lib_div::makeInstance($TYPO3_CONF_VARS['SC_OPTIONS']['errors']['exceptionHandler']);
        $TT->pull();
 }