Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info

2018-11-20 20:16:16 +01:00 · 2018-11-20 20:16:16 +01:00 · 0bea0308f1
commit 0bea0308f1
parent d3180e0ccc 5b3480d896
4 changed files with 6 additions and 6 deletions
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@ -284,7 +284,7 @@ defmodule Pleroma.User do
  end

  def locked?(%User{} = user) do
-    user.info["locked"] || false
+    user.info.locked || false
  end

  def get_by_ap_id(ap_id) do