From 445e9f65e13812fc1bf31ecd4b19ef4a1cb82050 Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Thu, 21 Feb 2013 01:25:59 +0800 Subject: Bug 842784: Persona sign in automatically signs in user --- .../en/default/hook/global/header-additional_header.html.tmpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'extensions/Persona/template/en/default/hook') diff --git a/extensions/Persona/template/en/default/hook/global/header-additional_header.html.tmpl b/extensions/Persona/template/en/default/hook/global/header-additional_header.html.tmpl index 7260fd9a8..fce6aeac5 100644 --- a/extensions/Persona/template/en/default/hook/global/header-additional_header.html.tmpl +++ b/extensions/Persona/template/en/default/hook/global/header-additional_header.html.tmpl @@ -58,7 +58,9 @@ function persona_onlogin(assertion) { } navigator.id.watch({ - loggedInUser: [% IF user.id %]'[% user.login FILTER js %]'[% ELSE %]null[% END %], + [%# we can't set loggedInUser to user.login as this causes cgi authenticated + sessions to be logged out by persona %] + loggedInUser: null, onlogin: persona_onlogin, onlogout: function () { document.location = '[% urlbase FILTER none %]index.cgi?logout=1'; -- cgit v1.2.3-24-g4f1b