summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.htaccess1
-rw-r--r--Bugzilla.pm2
-rw-r--r--extensions/Persona/template/en/default/hook/account/create-additional_methods.html.tmpl14
3 files changed, 2 insertions, 15 deletions
diff --git a/.htaccess b/.htaccess
index 92c07097a..af6fe720a 100644
--- a/.htaccess
+++ b/.htaccess
@@ -37,6 +37,7 @@ Redirect permanent /etiquette.html https://bugzilla.mozilla.org/page.cgi?id=etiq
Redirect permanent /duplicates.html https://bugzilla.mozilla.org/duplicates.cgi
RewriteEngine On
+RewriteBase /852022/
RewriteRule ^review(.*) page.cgi?id=splinter.html$1 [QSA]
RewriteRule ^favicon\.ico$ extensions/BMO/web/images/favicon.ico
RewriteRule ^form[\.:](itrequest|mozlist|mktgevent|poweredby|presentation|trademark|recoverykey)$ enter_bug.cgi?product=mozilla.org&format=$1
diff --git a/Bugzilla.pm b/Bugzilla.pm
index 94c9ee9b8..e33a00cd2 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -87,7 +87,7 @@ use constant SHUTDOWNHTML_RETRY_AFTER => 3600;
# Global Code
#####################################################################
-# $::SIG{__DIE__} = i_am_cgi() ? \&CGI::Carp::confess : \&Carp::confess;
+$::SIG{__DIE__} = i_am_cgi() ? \&CGI::Carp::confess : \&Carp::confess;
# Note that this is a raw subroutine, not a method, so $class isn't available.
sub init_page {
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 346cdc5ac..6b0d772af 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
@@ -7,20 +7,6 @@
#%]
[% IF Param('user_info_class').split(',').contains('Persona') %]
-<script type="text/javascript">
-function persona_create_account() {
- navigator.id.getVerifiedEmail(function(assertion) {
- if (assertion) {
- // This code will be invoked once the user has successfully
- // selected an email address they control to sign in with.
- document.getElementById('persona_assertion').value = assertion;
- document.getElementById('persona_form').submit();
- return true;
- }
- });
-}
-</script>
-
Or, use your Persona account:
<img src="extensions/Persona/web/images/sign_in.png" onclick="persona_create_account()"
width="95" height="25" align="absmiddle">