summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2017-04-05 16:48:53 +0200
committerDylan William Hardison <dylan@hardison.net>2017-04-05 16:49:16 +0200
commit781249a9f9a03d2753241389a2a2a5463b373f0e (patch)
tree0ab72e0f3b7f74a8fba10cca6a957c12227f2596
parent1fedd4417705585548375c11ec67cfec26d9b995 (diff)
downloadbugzilla-781249a9f9a03d2753241389a2a2a5463b373f0e.tar.gz
bugzilla-781249a9f9a03d2753241389a2a2a5463b373f0e.tar.xz
[tests] fix markup to make tests pass.
-rwxr-xr-xindex.cgi8
-rw-r--r--template/en/default/global/header.html.tmpl5
2 files changed, 9 insertions, 4 deletions
diff --git a/index.cgi b/index.cgi
index 420a162b6..7ebc3130f 100755
--- a/index.cgi
+++ b/index.cgi
@@ -44,7 +44,11 @@ if ($cgi->param('logout')) {
# our weak etag is based on the bugzilla version parameter (BMO customization) and the announcehtml
# if either change, the cache will be considered invalid.
-my @etag_parts = (Bugzilla->params->{bugzilla_version}, Bugzilla->params->{announcehtml});
+my @etag_parts = (
+ Bugzilla->params->{bugzilla_version},
+ Bugzilla->params->{announcehtml},
+ Bugzilla->params->{createemailregexp},
+);
my $weak_etag = q{W/"} . md5_hex(@etag_parts) . q{"};
my $if_none_match = $cgi->http('If-None-Match');
@@ -84,4 +88,4 @@ else {
# Generate and return the UI (HTML page) from the appropriate template.
$template->process("index.html.tmpl", $vars)
or ThrowTemplateError( $template->error() );
-} \ No newline at end of file
+}
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 07a980050..9d8fa9449 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -328,12 +328,13 @@
<ul class="login-links">
[% IF Param('createemailregexp')
&& user.authorizer.user_can_create_account %]
- <li id="moz_new_account_container_top"><a href="createaccount.cgi">New&nbsp;Account</a></li>
+ <li id="moz_new_account_container_top"><a href="createaccount.cgi">New&nbsp;Account</a>
+ [% IF use_login_page %] <span class="separator">| </span> [% END %]
+ </li>
[% END %]
[% IF use_login_page %]
<li>
- <span class="separator">| </span>
<a href="[% urlbase %]login">Log In</a>
</li>
[% ELSE %]