X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Furls.py;h=631c15ef9c7923b013718c56757d7d9d5e4b1992;hb=6df317a72253c8f590630a331a4576784959d3e9;hp=f792a0578f5a8a2fa884a84f1244b5ae378a9463;hpb=c457730e8d49ee507846edeb8a474374f0122f25;p=myslice.git

diff --git a/myslice/urls.py b/myslice/urls.py
index f792a057..631c15ef 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -12,7 +12,12 @@ import components
 # admin.autodiscover()
 
 # to enable insert_above stuff
-from django.template.loader import add_to_builtins
+# add_to_builtins has changed location with django-1.7
+# also note this will probably go away some day
+try:
+    from django.template.loader import add_to_builtins
+except:
+    from django.template.base import add_to_builtins
 add_to_builtins('insert_above.templatetags.insert_tags')
 
 from settings import auxiliaries, INSTALLED_APPS
@@ -65,7 +70,7 @@ urls = [
     # seems to be what login_required uses to redirect ...
     (r'^accounts/login/$', portal.homeview.HomeView.as_view()),
     (r'^login/?$', portal.homeview.HomeView.as_view()),
-    (r'^logout/?$', 'auth.views.logout_user'),
+    (r'^logout/?$', 'localauth.views.logout_user'),
     #
     # the manifold proxy
     (r'^manifold/proxy/(?P<format>\w+)/?$', 'manifoldapi.manifoldproxy.proxy'),