From c66c99580306a77a88286cc398768928c2eb3f7c Mon Sep 17 00:00:00 2001 From: Logan Hanks Date: Thu, 20 Oct 2011 18:58:34 -0700 Subject: [PATCH] Fix logic error allowing users to assign flair to others. --- r2/r2/controllers/api.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py index b5557ad2a..a58fc5ddd 100644 --- a/r2/r2/controllers/api.py +++ b/r2/r2/controllers/api.py @@ -2138,12 +2138,14 @@ class ApiController(RedditController): g.log.debug('flair self-assignment not permitted') return - # Ignore given text if user doesn't have permission to customize it. - if (not c.site.is_moderator(c.user) and not c.user_is_admin - and not flair_template.text_editable): - text = None + if not c.site.is_moderator(c.user) and not c.user_is_admin: + # Ignore user choice if not an admin or mod. user = c.user + # Ignore given text if user doesn't have permission to customize it. + if not flair_template.text_editable: + text = None + if not text: text = flair_template.text