From: hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Sat, 9 Apr 2011 02:13:12 +0000 (+0000)
Subject: Don't force the slug on profile urls.
X-Git-Tag: live~367
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/57036ac147a3759cda54aefa125697c16b991cbb

Don't force the slug on profile urls.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@945 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/urls.py b/forum/urls.py
index 093be4f..3e9d19b 100644
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -103,9 +103,9 @@ core_urls = (
     url(r'^%s(?P<id>\d+)/(?P<slug>.*)/%s$' % (_('users/'), _('reputation/')), app.users.user_reputation, name='user_reputation'),
     url(r'^%s(?P<id>\d+)/(?P<slug>.*)/%s$' % (_('users/'), _('votes/')), app.users.user_votes, name='user_votes'),
     url(r'^%s(?P<id>\d+)/(?P<slug>.*)/%s$' % (_('users/'), _('recent/')), app.users.user_recent, name='user_recent'),
-    url(r'^%s(?P<id>\d+)/(?P<slug>.*)/$' % _('users/'), app.users.user_profile, name='user_profile'),
+    url(r'^%s(?P<id>\d+)/(?P<slug>.*)$' % _('users/'), app.users.user_profile, name='user_profile'),
     url(r'^%s$' % _('badges/'), app.meta.badges, name='badges'),
-    url(r'^%s(?P<id>\d+)/(?P<slug>[\w-]+)/?$' % _('badges/'), app.meta.badge, name='badge'),
+    url(r'^%s(?P<id>\d+)/(?P<slug>[\w-]+)?$' % _('badges/'), app.meta.badge, name='badge'),
     # (r'^admin/doc/' % _('admin/doc'), include('django.contrib.admindocs.urls')),
     
     url(r'^%s$' % _('upload/'), app.writers.upload, name='upload'),