Edgewall Software

Changes between Initial Version and Version 1 of Ticket #12249, comment 4


Ignore:
Timestamp:
Nov 28, 2015, 7:37:12 PM (8 years ago)
Author:
Ryan J Ollos

Legend:

Unmodified
Added
Removed
Modified
  • Ticket #12249, comment 4

    initial v1  
    11I made an error in [14248#file5]. The email address should always be obfuscated using `obfuscate_email_address`.
     2
     3{{{#!diff
     4diff --git a/trac/ticket/web_ui.py b/trac/ticket/web_ui.py
     5index 78ff6de..7a0a5c0 100644
     6--- a/trac/ticket/web_ui.py
     7+++ b/trac/ticket/web_ui.py
     8@@ -46,7 +46,8 @@ from trac.util.datefmt import (
     9 )
     10 from trac.util.html import to_fragment
     11 from trac.util.text import (
     12-    exception_to_unicode, empty, is_obfuscated, shorten_line
     13+    exception_to_unicode, empty, is_obfuscated, obfuscate_email_address,
     14+    shorten_line
     15 )
     16 from trac.util.presentation import separated
     17 from trac.util.translation import _, tag_, tagn_, N_, ngettext
     18@@ -1678,9 +1679,9 @@ class TicketModule(Component):
     19 
     20         def quote_original(author, original, link):
     21             if 'comment' not in req.args:  # i.e. comment was not yet edited
     22-                formatted_author = Chrome(self.env).format_author(req, author)
     23+                obfuscated_author = obfuscate_email_address(author)
     24                 data['comment'] = '\n'.join(
     25-                    ["Replying to [%s %s]:" % (link, formatted_author)] +
     26+                    ["Replying to [%s %s]:" % (link, obfuscated_author)] +
     27                     ["> %s" % line for line in original.splitlines()] + [''])
     28 
     29         if replyto == 'description':
     30}}}