diff --git a/qfq/exceptions/AbstractException.php b/qfq/exceptions/AbstractException.php index 7ff5ed6c369a41d46cab89017abd1ded9663b887..e50054b324b1b9df6a990f5dc0d029aa622b6171 100644 --- a/qfq/exceptions/AbstractException.php +++ b/qfq/exceptions/AbstractException.php @@ -24,7 +24,7 @@ class AbstractException extends \Exception { * @param \Exception $previous */ public function __construct($message = '', $code = 0, \Exception $previous = null) { - $this->store = \qfq\Store::getInstance(''); +// $this->store = \qfq\Store::getInstance(''); parent::__construct($message, $code, $previous); } @@ -38,7 +38,8 @@ class AbstractException extends \Exception { $this->messageArray['Message'] = $this->getMessage(); $this->messageArray['Code'] = $this->getCode(); - if ($this->store->getVar('debugShowStack', STORE_TYPO3) === '1') { + + if (Store::getVar('debugShowStack', STORE_TYPO3) === '1') { $this->messageArray['Stacktrace'] = '<pre>' . $this->getTraceAsString() . '</pre>'; } diff --git a/qfq/exceptions/DbException.php b/qfq/exceptions/DbException.php index 704f9a309483856fcae283375e990c63eb082274..47562938f99d6db4967302ea644402aac34e9148 100644 --- a/qfq/exceptions/DbException.php +++ b/qfq/exceptions/DbException.php @@ -26,12 +26,12 @@ class DbException extends AbstractException { public function formatMessage() { $this->messageArray['Type'] = 'Db Exception'; - $this->messageArray['Form'] = $this->store->getVar(SYSTEM_FORM, STORE_SYSTEM); - $this->messageArray['Form Element'] = $this->store->getVar(SYSTEM_FORM_ELEMENT, STORE_SYSTEM); - $this->messageArray['Form Element Column'] = $this->store->getVar(SYSTEM_FORM_ELEMENT_COLUMN, STORE_SYSTEM); - $this->messageArray['SQL before evaluation'] = $this->store->getVar(SYSTEM_SQL_RAW, STORE_SYSTEM); - $this->messageArray['SQL after evaluation'] = $this->store->getVar(SYSTEM_SQL_FINAL, STORE_SYSTEM); - $this->messageArray['SQL Params'] = $this->store->getVar(SYSTEM_SQL_PARAM_ARRAY, STORE_SYSTEM); + $this->messageArray['Form'] = Store::getVar(SYSTEM_FORM, STORE_SYSTEM); + $this->messageArray['Form Element'] = Store::getVar(SYSTEM_FORM_ELEMENT, STORE_SYSTEM); + $this->messageArray['Form Element Column'] = Store::getVar(SYSTEM_FORM_ELEMENT_COLUMN, STORE_SYSTEM); + $this->messageArray['SQL before evaluation'] = Store::getVar(SYSTEM_SQL_RAW, STORE_SYSTEM); + $this->messageArray['SQL after evaluation'] = Store::getVar(SYSTEM_SQL_FINAL, STORE_SYSTEM); + $this->messageArray['SQL Params'] = Store::getVar(SYSTEM_SQL_PARAM_ARRAY, STORE_SYSTEM); return parent::formatException(); diff --git a/qfq/exceptions/UserException.php b/qfq/exceptions/UserException.php index 63358269b944b148b982d41aa8a9062758522e1a..0693f1e08dc44a508f5785f88dba7a1be3e527ed 100644 --- a/qfq/exceptions/UserException.php +++ b/qfq/exceptions/UserException.php @@ -26,9 +26,9 @@ class UserException extends AbstractException { public function formatMessage() { $this->messageArray['Type'] = 'User Exception'; - $this->messageArray['Form'] = $this->store->getVar(SYSTEM_FORM, STORE_SYSTEM); - $this->messageArray['Form Element'] = $this->store->getVar(SYSTEM_FORM_ELEMENT, STORE_SYSTEM); - $this->messageArray['Form Element Column'] = $this->store->getVar(SYSTEM_FORM_ELEMENT_COLUMN, STORE_SYSTEM); + $this->messageArray['Form'] = Store::getVar(SYSTEM_FORM, STORE_SYSTEM); + $this->messageArray['Form Element'] = Store::getVar(SYSTEM_FORM_ELEMENT, STORE_SYSTEM); + $this->messageArray['Form Element Column'] = Store::getVar(SYSTEM_FORM_ELEMENT_COLUMN, STORE_SYSTEM); return parent::formatException(); }