diff options
| author | Byron Jones <bjones@mozilla.com> | 2013-04-24 17:37:14 +0200 |
|---|---|---|
| committer | Byron Jones <bjones@mozilla.com> | 2013-04-24 17:37:14 +0200 |
| commit | c5e92e718cc10466b83ab3980991f3d159c2527d (patch) | |
| tree | 489ed0871fdc2681857f192e3f2f6ac96122d667 /extensions/Persona/template | |
| parent | 290029c1c1ba8b3f1ef18b56c94f947bd550d056 (diff) | |
| download | bugzilla-c5e92e718cc10466b83ab3980991f3d159c2527d.tar.gz bugzilla-c5e92e718cc10466b83ab3980991f3d159c2527d.tar.xz | |
Bug 858045: unable to login with persona on the createaccount page (persona_create_account is not defined)
Diffstat (limited to 'extensions/Persona/template')
| -rw-r--r-- | extensions/Persona/template/en/default/hook/account/create-additional_methods.html.tmpl | 11 | ||||
| -rw-r--r-- | extensions/Persona/template/en/default/hook/global/header-additional_header.html.tmpl | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/extensions/Persona/template/en/default/hook/account/create-additional_methods.html.tmpl b/extensions/Persona/template/en/default/hook/account/create-additional_methods.html.tmpl index 6b0d772af..355ce3629 100644 --- a/extensions/Persona/template/en/default/hook/account/create-additional_methods.html.tmpl +++ b/extensions/Persona/template/en/default/hook/account/create-additional_methods.html.tmpl @@ -6,13 +6,8 @@ # defined by the Mozilla Public License, v. 2.0. #%] -[% IF Param('user_info_class').split(',').contains('Persona') %] +[% RETURN UNLESS Param('user_info_class').split(',').contains('Persona') %] + Or, use your Persona account: -<img src="extensions/Persona/web/images/sign_in.png" onclick="persona_create_account()" +<img src="extensions/Persona/web/images/sign_in.png" onclick="persona_sign_in()" width="95" height="25" align="absmiddle"> - -<form id="persona_form" method="POST" action="index.cgi"> - <input type="hidden" name="token" value="[% issue_hash_token(['login']) FILTER html %]"> - <input type="hidden" name="persona_assertion" id="persona_assertion" value=""> -</form> -[% END %] 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 a2f150373..f6d68a5af 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 @@ -29,7 +29,9 @@ function createHidden(name, value, form) { } [% login_target = cgi.url("-relative" => 1, "-query" => 1) %] -[% IF !login_target OR login_target.match("^token.cgi") %] +[% IF !login_target + OR login_target.match("^token\.cgi") + OR login_target.match("^createaccount\.cgi") %] [% login_target = "index.cgi" %] [% END %] [% login_target = urlbase _ login_target %] |