From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 28 Oct 2012 20:43:30 +0000 (+0100)
Subject: Don't double-escape email addresses.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86def07362e7f7cac3409dcc98729eb2cee3fddd;p=pbs.git

Don't double-escape email addresses.
---

diff --git a/data/templates/distro-source-commit-detail.html b/data/templates/distro-source-commit-detail.html
index b6fcfadd..2152e206 100644
--- a/data/templates/distro-source-commit-detail.html
+++ b/data/templates/distro-source-commit-detail.html
@@ -53,11 +53,11 @@
 					</tr>
 					<tr>
 						<td>{{ _("Author") }}</td>
-						<td>{{ format_email(commit.author) }}</td>
+						<td>{% raw format_email(commit.author) %}</td>
 					</tr>
 					<tr>
 						<td>{{ _("Committer") }}</td>
-						<td>{{ format_email(commit.committer) }}</td>
+						<td>{% raw format_email(commit.committer) %}</td>
 					</tr>
 					<tr>
 						<td>{{ _("Subject") }}</td>
diff --git a/data/templates/modules/bugs-table.html b/data/templates/modules/bugs-table.html
index 5e7a40fc..e672723f 100644
--- a/data/templates/modules/bugs-table.html
+++ b/data/templates/modules/bugs-table.html
@@ -10,7 +10,7 @@
 				{{ bug.summary }}
 
 				{% if bug.assignee %}
-					<br />{{ format_email(bug.assignee) }}
+					<br />{% raw format_email(bug.assignee) %}
 				{% end %}
 			</td>
 		</tr>
diff --git a/data/templates/modules/commits-table.html b/data/templates/modules/commits-table.html
index ba56c85c..9667e131 100644
--- a/data/templates/modules/commits-table.html
+++ b/data/templates/modules/commits-table.html
@@ -25,7 +25,7 @@
 					{{ format_date(commit.date, full_format=True) }}
 				</td>
 				<td>
-					{{ format_email(commit.author) }}
+					{% raw format_email(commit.author) %}
 				</td>
 				<td>
 					{{ commit.subject }}
diff --git a/data/templates/modules/maintainer.html b/data/templates/modules/maintainer.html
index 7bc4a585..2eee20e1 100644
--- a/data/templates/modules/maintainer.html
+++ b/data/templates/modules/maintainer.html
@@ -1,5 +1,5 @@
 {% if type == "string" %}
-	{{ format_email(maintainer) }}
+	{% raw format_email(maintainer) %}
 {% elif type == "user" %}
 	<a href="/user/{{ maintainer.name }}">
 		{% if maintainer.is_admin() %}
diff --git a/data/templates/modules/package-header.html b/data/templates/modules/package-header.html
index 5a4401d6..b822fa6f 100644
--- a/data/templates/modules/package-header.html
+++ b/data/templates/modules/package-header.html
@@ -15,7 +15,7 @@
 					<tr>
 						<td>{{ _("Homepage") }}</td>
 						<td>
-							{{ linkify(pkg.url, shorten=True, extra_params='target="_blank"', permitted_protocols=["http", "https", "ftp"]) }}
+							{% raw linkify(pkg.url, shorten=True, extra_params='target="_blank"', permitted_protocols=["http", "https", "ftp"]) %}
 						</td>
 					</tr>
 				{% end %}