From 92ab6dc63525e9f30694a28e68ab1b6a636c3d4b Mon Sep 17 00:00:00 2001
From: niphlod <niphlod@gmail.com>
Date: Mon, 25 Nov 2013 22:46:27 +0100
Subject: [PATCH] fix issue 1780

---
 gluon/globals.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gluon/globals.py b/gluon/globals.py
index 094038df..58b2c0de 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -976,10 +976,11 @@ class Session(Storage):
 
         # if not cookie_key, but session_data_name in cookies
         # expire session_data_name from cookies
-        if response.session_data_name in cookies:
-            rcookies[response.session_data_name] = 'expired'
-            rcookies[response.session_data_name]['path'] = '/'
-            rcookies[response.session_data_name]['expires'] = PAST
+        if not response.session_cookie_key:
+            if response.session_data_name in cookies:
+                rcookies[response.session_data_name] = 'expired'
+                rcookies[response.session_data_name]['path'] = '/'
+                rcookies[response.session_data_name]['expires'] = PAST
         if response.session_id:
             rcookies[response.session_id_name] = response.session_id
             rcookies[response.session_id_name]['path'] = '/'