From ce0cbcedb40f319faa68992554dc8f067b06a01a Mon Sep 17 00:00:00 2001 From: tonio Date: Tue, 27 Oct 2009 11:03:00 +0100 Subject: [PATCH] Bugfix: bad loading of plugins urls. --- extensions/__init__.py | 7 +++++-- urls.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/extensions/__init__.py b/extensions/__init__.py index b2526b98f..459e1035f 100644 --- a/extensions/__init__.py +++ b/extensions/__init__.py @@ -17,7 +17,10 @@ def loadextensions(): globals()['extensions'] += [module] def loadmenus(): - result = () + result = [] for mod in extensions: - result += mod.main.urls() + u = mod.main.urls() + if u == (): + continue + result += (u,) return result diff --git a/urls.py b/urls.py index c4bf8899a..9d999ca52 100644 --- a/urls.py +++ b/urls.py @@ -28,7 +28,7 @@ urlpatterns = patterns('', ) menus = loadmenus() if menus != (): - urlpatterns += patterns('', menus) + urlpatterns += patterns('', *menus) if settings.DEBUG: urlpatterns += patterns(