From: philipp <philipp@7aebc617-e5e2-0310-91dc-80fb5f6d2477>
Date: Wed, 17 Apr 2013 21:45:48 +0000 (+0000)
Subject: Merged MediaWiki version 1.19.5.
X-Git-Url: https://git.toastfreeware.priv.at/philipp/winterrodeln/wrfeed.git/commitdiff_plain/4b99ffc22482fb2617f05d101f60907f74bb6c0b

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 3125317..deac8e6 100644
--- 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