Anonymous committed 8f5b8af

Flip the activation URLConf back to match on \w+ and add a comment explaining why.

Comments (0)

Files changed (1)

 from views import activate, register
 urlpatterns = patterns('',
-                       (r'^activate/(?P<activation_key>[a-fA-F0-9]+)/$', activate),
+                       # Activation keys get matched by \w+ instead of the more specific
+                       # [a-fA-F0-9]+ because a bad activation key should still get to the view;
+                       # that way it can return a sensible "invalid key" message instead of a
+                       # confusing 404.
+                       (r'^activate/(?P<activation_key>\w+)/$', activate),
                        (r'^login/$', login, {'template_name': 'registration/login.html'}),
                        (r'^logout/$', logout, {'template_name': 'registration/logout.html'}),
                        (r'^register/$', register),