]> git.ipfire.org Git - pbs.git/commitdiff
Don't double-escape email addresses.
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 28 Oct 2012 20:43:30 +0000 (21:43 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 28 Oct 2012 20:43:30 +0000 (21:43 +0100)
data/templates/distro-source-commit-detail.html
data/templates/modules/bugs-table.html
data/templates/modules/commits-table.html
data/templates/modules/maintainer.html
data/templates/modules/package-header.html

index b6fcfadd2cb5e833577a80de6eff31bf0a166405..2152e206c1e1d6aac023625a4d9b323b2518d0b8 100644 (file)
                                        </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>
index 5e7a40fcbd85ae77ffe9edb2e38b026efc926065..e672723f792e9f3b20ae14f4a26a37e215bcdc18 100644 (file)
@@ -10,7 +10,7 @@
                                {{ bug.summary }}
 
                                {% if bug.assignee %}
-                                       <br />{{ format_email(bug.assignee) }}
+                                       <br />{% raw format_email(bug.assignee) %}
                                {% end %}
                        </td>
                </tr>
index ba56c85c4afd21cfd640da6a80caac01dc695867..9667e1310345ac0bbe90ad18f9da625dfa18a5dc 100644 (file)
@@ -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 }}
index 7bc4a585cc02b5c40a0655bb9a8722d60bbb73d8..2eee20e14b95cd79f49ebd97f759b47b837b2209 100644 (file)
@@ -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() %}
index 5a4401d6edacbbf5e6d037463aafd0e67c9df680..b822fa6f6b09be7ff7cf36a465786f6f4d1aa6c2 100644 (file)
@@ -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 %}