From adaf59cbd98fcd11e1f932816d63b1639dafaba2 Mon Sep 17 00:00:00 2001 From: kremsy Date: Sat, 15 Feb 2014 19:19:03 +0100 Subject: [PATCH] update --- application/core/ErrorHandler.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/application/core/ErrorHandler.php b/application/core/ErrorHandler.php index fbca7c33..c7be1fbc 100644 --- a/application/core/ErrorHandler.php +++ b/application/core/ErrorHandler.php @@ -37,7 +37,7 @@ class ErrorHandler { $message .= "Trace: {$ex->getTraceAsString()}" . PHP_EOL; logMessage($message); - $error = array(); + $error = array(); $error["Type"] = "Exception"; $error["Message"] = $message; $error['OperatingSystem'] = php_uname(); @@ -87,30 +87,30 @@ class ErrorHandler { // Error suppressed return false; } - + // Log error $errorTag = $this->getErrorTag($errorNumber); $message = "{$errorTag}: {$errorString} in File '{$errorFile}' on Line {$errorLine}!"; logMessage($message); if ($errorNumber != E_USER_ERROR && $errorNumber != E_USER_WARNING && $errorNumber != E_USER_NOTICE) { - $error = array(); + $error["Type"] = "Error"; $error["Message"] = $message; $error['OperatingSystem'] = php_uname(); $error['PHPVersion'] = phpversion(); - - if ($this->maniaControl->server != null) { + + if ($this->maniaControl->server) { $error['ServerLogin'] = $this->maniaControl->server->login; } else { - $error['ServerLogin'] = null; + $error['ServerLogin'] = ''; } - if ($this->maniaControl->settingManager != null && $this->maniaControl->updateManager != null) { + if ($this->maniaControl->settingManager && $this->maniaControl->updateManager) { $error['UpdateChannel'] = $this->maniaControl->settingManager->getSetting($this->maniaControl->updateManager, UpdateManager::SETTING_UPDATECHECK_CHANNEL); $error['ManiaControlVersion'] = $this->maniaControl->updateManager->getCurrentBuildDate(); } else { - $error['UpdateChannel'] = null; + $error['UpdateChannel'] = ''; $error['ManiaControlVersion'] = ManiaControl::VERSION; }