Merged MediaWiki version 1.19.5.

git-svn-id: http://www.winterrodeln.org/svn/servermediawiki/trunk/wrfeed@1353 7aebc617-e5e2-0310-91dc-80fb5f6d2477

diff --git a/wrfeed/config/routing.py b/wrfeed/config/routing.py
index 312531789d9de524f9791870731b97836a43dfca..deac8e656ffa1fddc23729e08a04cd0595481d9f 100644 (file)
--- a/wrfeed/config/routing.py
+++ b/wrfeed/config/routing.py
@@ -27,7 +27,7 @@ def make_map(config):
 
     # CUSTOM ROUTES HERE
 
-    map.connect('/{controller}/{action}')
-    map.connect('/{controller}/{action}/{id}')
+    map.connect('/berichte/alle', controller='berichte', action='alle')
+    map.connect('/berichte/{action}/{id}', controller='berichte')
 
     return map