web: strip site from social registration; remove empty twitter urls.

eventbrite · Dec 27, 2011 · 7844594 · 7844594
1 parent 9d7f8d9
commit 7844594
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/pykeg/src/pykeg/web/contrib/twitter/urls.py b/pykeg/src/pykeg/web/contrib/twitter/urls.py
diff --git a/pykeg/src/pykeg/web/urls.py b/pykeg/src/pykeg/web/urls.py
@@ -50,7 +50,7 @@ def basedir():
      'registration/password_reset_complete.html'}),
 
     ### socialregistration
-    (r'^(?P<kbsite_name>)sr/', include('socialregistration.urls')),
+    (r'^sr/', include('socialregistration.urls')),
 
     ### charts
     (r'^(?P<kbsite_name>)charts/', include('pykeg.web.charts.urls')),
@@ -62,7 +62,7 @@ def basedir():
     (r'^(?P<kbsite_name>)sentry/', include('sentry.web.urls')),
 
     ### main kegweb urls
-    (r'(?P<kbsite_name>)', include('pykeg.web.kegweb.urls')),
+    (r'^(?P<kbsite_name>)', include('pykeg.web.kegweb.urls')),
 )
 
 if features.use_facebook():
@@ -71,12 +71,6 @@ def basedir():
       (r'^(?P<kbsite_name>)fb/', include('pykeg.web.contrib.facebook.urls')),
   )
 
-if features.use_twitter():
-  urlpatterns += patterns('',
-      ### twitter kegweb stuff
-      (r'^(?P<kbsite_name>)twitter/', include('pykeg.web.contrib.twitter.urls')),
-  )
-
 ### accounts and registration
 # uses the stock django-registration views, except we need to override the
 # registration class for acocunt/register