changeset 4664:14017d47a003

merged moin/1.7
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Tue, 24 Mar 2009 22:13:23 +0100
parents 3a7c9b0a6ae4 (current diff) 68628fe3b091 (diff)
children 757aad5a56ff 83451b52e947
files MoinMoin/events/jabbernotify.py
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/events/emailnotify.py	Tue Mar 24 21:05:46 2009 +0100
+++ b/MoinMoin/events/emailnotify.py	Tue Mar 24 22:13:23 2009 +0100
@@ -136,7 +136,7 @@
     for lang in subscribers:
         recipients.extend(subscribers[lang])
 
-    attachlink = request.getBaseURL() + getAttachUrl(event.pagename, event.filename, request)
+    attachlink = request.getQualifiedURL(getAttachUrl(event.pagename, event.filename, request))
     pagelink = request.getQualifiedURL(page.url(request, {}))
 
     for lang in subscribers:
--- a/MoinMoin/events/jabbernotify.py	Tue Mar 24 21:05:46 2009 +0100
+++ b/MoinMoin/events/jabbernotify.py	Tue Mar 24 22:13:23 2009 +0100
@@ -75,7 +75,7 @@
     for lang in subscribers:
         recipients.extend(subscribers[lang])
 
-    attachlink = request.getBaseURL() + getAttachUrl(event.pagename, event.filename, request)
+    attachlink = request.getQualifiedURL(getAttachUrl(event.pagename, event.filename, request))
     pagelink = request.getQualifiedURL(page.url(request, {}))
 
     for lang in subscribers.keys():