Merge branch 'nogo-3.x' into 3.x

Closes #1777
slimphp · Feb 24, 2016 · d578da3 · d578da3
2 parents 2597d9e + e5873ec
commit d578da3
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Slim/Handlers/PhpError.php b/Slim/Handlers/PhpError.php
@@ -224,15 +224,15 @@ protected function renderHtmlError(Throwable $error)
      */
     protected function renderJsonErrorMessage(Throwable $error)
     {
-        $error = [
+        $json = [
             'message' => 'Slim Application Error',
         ];
 
         if ($this->displayErrorDetails) {
-            $error['error'] = [];
+            $json['error'] = [];
 
             do {
-                $error['error'][] = [
+                $json['error'][] = [
                     'type' => get_class($error),
                     'code' => $error->getCode(),
                     'message' => $error->getMessage(),
@@ -243,7 +243,7 @@ protected function renderJsonErrorMessage(Throwable $error)
             } while ($error = $error->getPrevious());
         }
 
-        return json_encode($error, JSON_PRETTY_PRINT);
+        return json_encode($json, JSON_PRETTY_PRINT);
     }
 
     /**