Merge remote-tracking branch 'origin/develop' into global-status-expiration

[akkoma] / lib / pleroma / web / views / error_view.ex

diff --git a/lib/pleroma/web/views/error_view.ex b/lib/pleroma/web/views/error_view.ex
index f4c04131c949708251e4bdd95a045ecd02f7c1d3..e68d55e0850e79c14f8f2200d5f19518b4c6862b 100644 (file)
--- a/lib/pleroma/web/views/error_view.ex
+++ b/lib/pleroma/web/views/error_view.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ErrorView do
@@ -13,7 +13,7 @@ defmodule Pleroma.Web.ErrorView do
   def render("500.json", assigns) do
     Logger.error("Internal server error: #{inspect(assigns[:reason])}")
 
-    if Mix.env() != :prod do
+    if Pleroma.Config.get(:env) != :prod do
       %{errors: %{detail: "Internal server error", reason: inspect(assigns[:reason])}}
     else
       %{errors: %{detail: "Internal server error"}}