changeset 3751:507867abcc19

remove url_prefix setting
author Johannes Berg <johannes AT sipsolutions DOT net>
date Sun, 22 Jun 2008 01:10:54 +0200
parents d5b786be06d7
children 5cca96861760
files MoinMoin/config/multiconfig.py docs/CHANGES
diffstat 2 files changed, 2 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/config/multiconfig.py	Sun Jun 22 01:01:05 2008 +0200
+++ b/MoinMoin/config/multiconfig.py	Sun Jun 22 01:10:54 2008 +0200
@@ -345,9 +345,6 @@
         self.cache.acl_rights_default = AccessControlList(self, [self.acl_rights_default])
         self.cache.acl_rights_after = AccessControlList(self, [self.acl_rights_after])
 
-        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]
@@ -924,15 +921,6 @@
 
     ('url_mappings', {}, None),
 
-    # url_prefix is DEPRECATED and not used any more by the code.
-    # it confused many people by its name and default value of '/wiki' to the
-    # wrong conclusion that it is the url of the wiki (the dynamic) stuff,
-    # but it was used to address the static stuff (images, css, js).
-    # Thus we use the more clear url_prefix_static ['/moin_staticVVV'] setting now.
-    # For a limited time, we still look at url_prefix - if it is not None, we
-    # copy the value to url_prefix_static to ease transition.
-    ('url_prefix', None, None),
-
     # includes the moin version number, so we can have a unlimited cache lifetime
     # for the static stuff. if stuff changes on version upgrade, url will change
     # immediately and we have no problem with stale caches.
--- a/docs/CHANGES	Sun Jun 22 01:01:05 2008 +0200
+++ b/docs/CHANGES	Sun Jun 22 01:10:54 2008 +0200
@@ -36,6 +36,8 @@
   Bug Fixes:
     * ...
 
+  Removed Features:
+    * url_prefix setting
 
 Version 1.7.0current:
   Note: This is a reduced CHANGES, ommitting details from rc/beta test and