diff options
| author | Byron Jones <bjones@mozilla.com> | 2013-02-20 18:25:59 +0100 |
|---|---|---|
| committer | Byron Jones <bjones@mozilla.com> | 2013-02-20 18:25:59 +0100 |
| commit | 445e9f65e13812fc1bf31ecd4b19ef4a1cb82050 (patch) | |
| tree | b22b6a976725b01e5803b3da0552a3acad85dbd8 /extensions/Persona/template | |
| parent | 1452147a39916db8b7980c84be80e9e20067a326 (diff) | |
| download | bugzilla-445e9f65e13812fc1bf31ecd4b19ef4a1cb82050.tar.gz bugzilla-445e9f65e13812fc1bf31ecd4b19ef4a1cb82050.tar.xz | |
Bug 842784: Persona sign in automatically signs in user
Diffstat (limited to 'extensions/Persona/template')
| -rw-r--r-- | extensions/Persona/template/en/default/hook/global/header-additional_header.html.tmpl | 4 |
1 files changed, 3 insertions, 1 deletions
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'; |