Merge branch 'master' into mistletoe

files/routes/front.py

@@ -255,8 +255,7 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, filter_words='
 	elif sort == "comments":
 		posts = posts.order_by(Submission.comment_count.desc())
 
-	if v:
-		size = v.frontsize
+	if v: size = v.frontsize or 0
 	else: size = 25
 
 	posts = posts.offset(size * (page - 1)).limit(size+1).all()

files/routes/settings.py

@@ -848,8 +848,6 @@ def settings_profilecss(v):
 @validate_formkey
 def settings_block_user(v):
 
-	if v and v.admin_level: return {"error": "Admins can't block users."}, 403
-
 	user = get_user(request.values.get("username"), graceful=True)
 
 	if not user: return {"error": "That user doesn't exist."}, 404