projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/crash-favourited-by-ordered-collections' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
web.ex
diff --git
a/lib/pleroma/web/web.ex
b/lib/pleroma/web/web.ex
index 4bf07a6ef6eba6d6207a70532ec59507a125dc96..b42f6887e17b090535f9170f6703ee8ca9b6f2fa 100644
(file)
--- a/
lib/pleroma/web/web.ex
+++ b/
lib/pleroma/web/web.ex
@@
-23,11
+23,17
@@
defmodule Pleroma.Web do
def controller do
quote do
use Phoenix.Controller, namespace: Pleroma.Web
def controller do
quote do
use Phoenix.Controller, namespace: Pleroma.Web
+
import Plug.Conn
import Pleroma.Web.Gettext
import Pleroma.Web.Router.Helpers
import Plug.Conn
import Pleroma.Web.Gettext
import Pleroma.Web.Router.Helpers
+ import Pleroma.Web.TranslationHelpers
+
+ plug(:set_put_layout)
- plug(:put_layout, Application.get_env(:pleroma, :app_layout, "app.html"))
+ defp set_put_layout(conn, _) do
+ put_layout(conn, Pleroma.Config.get(:app_layout, "app.html"))
+ end
end
end
end
end