Merge remote-tracking branch 'ntucker/master'

andrei1089 · Mar 13, 2013 · ea32981 · ea32981
2 parents 80a094e + dfa8011
commit ea32981
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/account/views.py b/account/views.py
@@ -187,18 +187,15 @@ def is_open(self):
             try:
                 self.signup_code = SignupCode.check(code)
             except SignupCode.InvalidCode:
-                if not settings.ACCOUNT_OPEN_SIGNUP:
-                    return False
-                else:
-                    if self.messages.get("invalid_signup_code"):
-                        messages.add_message(
-                            self.request,
-                            self.messages["invalid_signup_code"]["level"],
-                            self.messages["invalid_signup_code"]["text"] % {
-                                "code": code
-                            }
-                        )
-                    return True
+                if self.messages.get("invalid_signup_code"):
+                    messages.add_message(
+                        self.request,
+                        self.messages["invalid_signup_code"]["level"],
+                        self.messages["invalid_signup_code"]["text"] % {
+                            "code": code
+                        }
+                    )
+                return settings.ACCOUNT_OPEN_SIGNUP
             else:
                 return True
         else: