changeset 4665:757aad5a56ff

merged moin/1.8
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Tue, 24 Mar 2009 22:47:40 +0100
parents 1b3b177719ee (current diff) 14017d47a003 (diff)
children 025fb6ea4f9f
files MoinMoin/action/info.py MoinMoin/events/emailnotify.py MoinMoin/events/jabbernotify.py docs/CHANGES
diffstat 6 files changed, 29 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/info.py	Tue Mar 17 00:00:35 2009 +0100
+++ b/MoinMoin/action/info.py	Tue Mar 24 22:47:40 2009 +0100
@@ -210,7 +210,7 @@
 
     if show_hitcounts:
         from MoinMoin.stats import hitcounts
-        request.write(hitcounts.linkto(pagename, request, 'page=' + wikiutil.url_quote_plus(pagename)))
+        request.write(hitcounts.linkto(pagename, request, 'page=' + wikiutil.url_quote(pagename)))
     elif show_general:
         general(page, pagename, request)
     else:
--- a/MoinMoin/events/emailnotify.py	Tue Mar 17 00:00:35 2009 +0100
+++ b/MoinMoin/events/emailnotify.py	Tue Mar 24 22:47:40 2009 +0100
@@ -136,7 +136,7 @@
     for lang in subscribers:
         recipients.extend(subscribers[lang])
 
-    attachlink = request.url_root + 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 17 00:00:35 2009 +0100
+++ b/MoinMoin/events/jabbernotify.py	Tue Mar 24 22:47:40 2009 +0100
@@ -75,7 +75,7 @@
     for lang in subscribers:
         recipients.extend(subscribers[lang])
 
-    attachlink = request.url_root + 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():
--- a/docs/CHANGES	Tue Mar 17 00:00:35 2009 +0100
+++ b/docs/CHANGES	Tue Mar 24 22:47:40 2009 +0100
@@ -1,24 +1,9 @@
-MoinMoin Documentation Overview
-===============================
-
-docs/INSTALL.html: generic instructions about installing MoinMoin
-
-docs/UPDATE.html: generic instructions about updating MoinMoin
-
-docs/README.migration: migration procedure for your data_dir
-
-docs/CHANGES (this file): please completely read it until you reach the version
-                          you were using until now - otherwise you might miss
-                          some important upgrading and configuration hints.
-                          Starting with 1.5.3, update installation hints are
-                          marked with HINT. They assume you are upgrading from
-                          the last release version before (e.g. from 1.5.2 to
-                          1.5.3).
-
-
 MoinMoin Version History
 ========================
 
+Please note: Starting from the MoinMoin version you used previously, you
+should read all more recent entries (or at least everything marked with HINT).
+
 This release has known bugs (see MoinMoin:MoinMoinBugs), but we think it is
 already better than the previous stable release. Our release policy is not
 trying to make a "perfect release" (as that release might NEVER get released),
--- a/docs/README.migration	Tue Mar 17 00:00:35 2009 +0100
+++ b/docs/README.migration	Tue Mar 24 22:47:40 2009 +0100
@@ -1,3 +1,6 @@
+Converting your DATA when upgrading MoinMoin
+============================================
+
 Post 1.5.3 new style migration
 ==============================
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/README_FIRST	Tue Mar 24 22:47:40 2009 +0100
@@ -0,0 +1,20 @@
+MoinMoin Documentation Overview
+===============================
+
+docs/INSTALL.html: generic instructions about installing MoinMoin
+
+docs/UPDATE.html: generic instructions about updating MoinMoin
+
+docs/CHANGES: if you are upgrading from an older moin version, please
+              completely read all changes that happened after the version you
+              were using until now (in order)- otherwise you might miss some
+              important upgrading and configuration hints.
+              Starting with 1.5.3, update installation hints are marked with
+              HINT. They assume you are upgrading from the last release version
+              before (e.g. from 1.5.2 to 1.5.3).
+
+docs/README.migration: migration procedure for your data_dir (read this file
+                       to know how to upgrade your DATA).
+                       You MUST read UPDATE.html and CHANGES also for important
+                       infos about general update procedure and config changes.
+