diff MoinMoin/config/multiconfig.py @ 1339:544b931cd965

new setting url_prefix_action, cleanup page.url/link_to, wikiutil.link_tag
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 20 Aug 2006 13:50:27 +0200
parents 760002b5ffa3
children 3b527a26aa1f 05482b439f89
line wrap: on
line diff
--- a/MoinMoin/config/multiconfig.py	Fri Aug 18 23:41:37 2006 +0200
+++ b/MoinMoin/config/multiconfig.py	Sun Aug 20 13:50:27 2006 +0200
@@ -420,8 +420,7 @@
     url_prefix_static = '/moin_static160'
 
     # we need to prefix actions to be able to exclude them by robots.txt:
-    # TODO:
-    # url_prefix_action = '/action'
+    url_prefix_action = 'action' # no leading or trailing '/'
 
     logo_string = None
     interwikiname = None
@@ -583,6 +582,10 @@
         if self.url_prefix is not None: # remove this code when url_prefix setting is removed
             self.url_prefix_static = self.url_prefix
 
+        action_prefix = self.url_prefix_action
+        if action_prefix is not None and action_prefix.endswith('/'): # make sure there is no trailing '/'
+            self.url_prefix_action = action_prefix[:-1]
+
     def load_meta_dict(self):
         """ The meta_dict contains meta data about the wiki instance. """
         if getattr(self, "_meta_dict", None) is None: