Merge branch 'master' into constants

This commit is contained in:
atrc445 2021-08-21 23:10:23 +02:00
commit 4683ab2ae3
130 changed files with 266 additions and 272 deletions

View file

@ -567,7 +567,7 @@ def admin_title_change(user_id, v):
new_name=request.form.get("title").strip()
user.customtitleplain=new_name
new_name = sanitize(new_name, linkgen=True)
new_name = sanitize(new_name)
user=g.db.query(User).with_for_update().options(lazyload('*')).filter_by(id=user.id).first()
user.customtitle=new_name
@ -704,7 +704,7 @@ def ban_post(post_id, v):
ban_reason = ban_reason.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n")
with CustomRenderer() as renderer:
ban_reason = renderer.render(mistletoe.Document(ban_reason))
ban_reason = sanitize(ban_reason, linkgen=True)
ban_reason = sanitize(ban_reason)
post.ban_reason = ban_reason