From 240077ef7e91afb8cc89866c06fa2ca39d6a0c03 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Mon, 7 Jan 2013 16:05:19 -0500
Subject: Bug 820183 - BrowserID extension should allow custom configuration of
 browserid hostnames to use for verification r=glob

---
 .../en/default/hook/account/auth/login-additional_methods.html.tmpl  | 5 +++--
 .../hook/account/auth/login-small-additional_methods.html.tmpl       | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'extensions/BrowserID/template/en/default/hook/account')

diff --git a/extensions/BrowserID/template/en/default/hook/account/auth/login-additional_methods.html.tmpl b/extensions/BrowserID/template/en/default/hook/account/auth/login-additional_methods.html.tmpl
index 3a0ecb1cc..57f7da8ce 100644
--- a/extensions/BrowserID/template/en/default/hook/account/auth/login-additional_methods.html.tmpl
+++ b/extensions/BrowserID/template/en/default/hook/account/auth/login-additional_methods.html.tmpl
@@ -1,9 +1,10 @@
-[% IF Param('user_info_class').split(',').contains('BrowserID') %]
+[% IF Param('user_info_class').split(',').contains('BrowserID')
+      && Param('browserid_includejs_url') %]
 
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
 
-<script src="https://browserid.org/include.js" type="text/javascript"></script>
+<script src="[% Param('browserid_includejs_url') %]" type="text/javascript"></script>
 
 <script type="text/javascript">
 function createHidden(name, value, form) {
diff --git a/extensions/BrowserID/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl b/extensions/BrowserID/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl
index 08e68a690..b1c186493 100644
--- a/extensions/BrowserID/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl
+++ b/extensions/BrowserID/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl
@@ -1,5 +1,6 @@
-[% IF Param('user_info_class').split(',').contains('BrowserID') %]
-<script src="https://browserid.org/include.js" type="text/javascript"></script>
+[% IF Param('user_info_class').split(',').contains('BrowserID')
+      && Param('browserid_includejs_url') %]
+<script src="[% Param('browserid_includejs_url') %]" type="text/javascript"></script>
 
 [%# Note this code is a tiny bit different from the other copy; the name of
   # the variable containing the login url is 'login_target' rather than
-- 
cgit v1.2.3-24-g4f1b