From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Wed, 16 Apr 2008 21:12:19 +0000 (+0200)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=3c396ed67e80cc413303725209ebcfe7b3e36554;p=deb%2Fpackages.git

Merge branch 'master' into ubuntu-master

Conflicts:

	templates/html/show.tmpl
---

3c396ed67e80cc413303725209ebcfe7b3e36554
diff --cc templates/html/show.tmpl
index c725964,eec364b..8f76bb2
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@@ -106,15 -112,16 +106,15 @@@
  [%- FOREACH maintainers;
    mailarchiveurl = '';
    IF (matches = mail.match('^(.*)@lists\.debian\.org$'));
- 	mailarchiveurl = 'http://lists.debian.org/' _ matches.0 _ '/';
+ 	mailarchiveurl = 'http://lists.debian.org/' _ uri_escape(matches.0) _ '/';
    ELSIF (matches = mail.match('^(.*)@lists\.alioth\.debian\.org$'));
- 	mailarchiveurl = 'http://lists.alioth.debian.org/pipermail/' _ matches.0 _ '/';
+ 	mailarchiveurl = 'http://lists.alioth.debian.org/pipermail/' _ uri_escape(matches.0) _ '/';
    ELSIF (matches = mail.match('^(.*)@lists\.ubuntu\.com$'));
-   	mailarchiveurl = 'http://lists.ubuntu.com/archives/' _ matches.0 _ '/';
+   	mailarchiveurl = 'http://lists.ubuntu.com/archives/' _ uri_escape(matches.0) _ '/';
    END -%]
    [%- '<ul>' IF loop.first -%]
- 	<li><a href="mailto:[% mail %]">[% name | html %]</a>
+ 	<li><a href="mailto:[% mail | html %]">[% name | html %]</a>
 -	(<a href="[% ddpo_url %][% uri_escape(mail) %]" title="[% g("An overview over the maintainer's packages and uploads") %]">[% g('QA Page') %]</a>
 -	[%- IF mailarchiveurl %], <a href="[% mailarchiveurl %]" title="[% g('Archive of the Maintainer Mailinglist') %]">[% g('Mail Archive') %]</a>[% END %])
 +	[%- IF mailarchiveurl %](<a href="[% mailarchiveurl %]" title="[% g('Archive of the Maintainer Mailinglist') %]">[% g('Mail Archive') %]</a>)[% END %]
  	</li>
    [%- '</ul>' IF loop.last -%]
  [%- END -%]