[django-page-cms] r656 committed - Fix issue 146

[codesite...@google.com]

Revision: 656
Author: batiste.bieler
Date: Mon Aug 24 04:12:38 2009
Log: Fix issue 146
http://code.google.com/p/django-page-cms/source/detail?r=656

Modified:
/trunk/doc/installation.rst
/trunk/pages/managers.py

=======================================
--- /trunk/doc/installation.rst Mon Jul 20 23:57:02 2009
+++ /trunk/doc/installation.rst Mon Aug 24 04:12:38 2009
@@ -58,7 +58,7 @@
urlpatterns = patterns('',
...
url(r'^pages/', include('pages.urls')),
- (r'^admin/(.*)', admin.site.root),
+ (r'^admin/', include(admin.site.urls)),
)

When you will visit the site the first time (``/pages/``), you will get a
404 error
=======================================
--- /trunk/pages/managers.py Fri Aug 21 10:44:30 2009
+++ /trunk/pages/managers.py Mon Aug 24 04:12:38 2009
@@ -228,9 +228,9 @@

url = normalize_url(path)
# §1: try with complete query string
- if ("QUERY_STRING" in request.META and
- request.META["QUERY_STRING"] != ""):
- url = url + '?' + request.META["QUERY_STRING"]
+ query = request.META.get('QUERY_STRING')
+ if query:
+ url = url + '?' + query
try:
alias = PageAlias.objects.get(url=url)
return alias