From 74491d16ae1f8da180f6f06bccddd3df987a9e1a Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Sun, 2 Sep 2018 19:54:36 +0200
Subject: [PATCH] Fix a resolver error

---
 src/pretix/presale/views/cart.py  | 5 ++++-
 src/pretix/presale/views/event.py | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pretix/presale/views/cart.py b/src/pretix/presale/views/cart.py
index fc7c166bd..0292f95f6 100644
--- a/src/pretix/presale/views/cart.py
+++ b/src/pretix/presale/views/cart.py
@@ -48,7 +48,10 @@ class CartActionMixin:
             u += '&require_cookie=true'
         else:
             u += '?require_cookie=true'
-        if 'iframe' in self.request.GET or settings.SESSION_COOKIE_NAME not in self.request.COOKIES:
+        disclose_cart_id = (
+            'iframe' in self.request.GET or settings.SESSION_COOKIE_NAME not in self.request.COOKIES
+        ) and self.kwargs.get('cart_namespace')
+        if disclose_cart_id:
             cart_id = get_or_create_cart_id(self.request)
             u += '&cart_id={}'.format(cart_id)
         return u
diff --git a/src/pretix/presale/views/event.py b/src/pretix/presale/views/event.py
index 6e4250ff2..6ede42614 100644
--- a/src/pretix/presale/views/event.py
+++ b/src/pretix/presale/views/event.py
@@ -193,7 +193,7 @@ class EventIndex(EventViewMixin, CartMixin, TemplateView):
             # Cookies are in fact not supported
             r = render(request, 'pretixpresale/event/cookies.html', {
                 'url': eventreverse(
-                    request.event, "presale:event.index", kwargs={'cart_namespace': kwargs.get('cart_namespace')}
+                    request.event, "presale:event.index", kwargs={'cart_namespace': kwargs.get('cart_namespace') or ''}
                 ) + (
                     "?src=widget&take_cart_id={}".format(request.GET.get('cart_id'))
                     if "cart_id" in request.GET else ""