Update for newer django

[sommitrealweird.git] / sommitrealweird / blog / context_processors.py

diff --git a/sommitrealweird/blog/context_processors.py b/sommitrealweird/blog/context_processors.py
index 14a921609d37a8b65a022b76d7d2cc37eb5fd18f..9505bb961965f5bfad56e996d2ca8d602d68aeba 100644 (file)
--- a/sommitrealweird/blog/context_processors.py
+++ b/sommitrealweird/blog/context_processors.py
@@ -2,19 +2,29 @@ from django.conf import settings
 from blog.models import BlogEntry, BlogSection
 import re
 
 from blog.models import BlogEntry, BlogSection
 import re
 

+def blog_feed(request):
+    return {
+        'BLOG_FEED_ROOT': settings.BLOG_FEED_ROOT,
+    } 
+

 def content_breadcrumb(request):
     path = request.path
     if path[0:len(settings.BLOG_ROOT)] == settings.BLOG_ROOT:
 def content_breadcrumb(request):
     path = request.path
     if path[0:len(settings.BLOG_ROOT)] == settings.BLOG_ROOT:

-        breadcrumb = [{'url': u'/', 'title': u'/'}, {'url': settings.BLOG_ROOT, 'title': u'blog'},]
+        breadcrumb = [{'url': u'/', 'title': u'Home'}, {'url': settings.BLOG_ROOT, 'title': u'Blog'},]

 
         path = path[len(settings.BLOG_ROOT):]
 
         parts = path.split('/')
 
         if parts[0] == "section":
 
         path = path[len(settings.BLOG_ROOT):]
 
         parts = path.split('/')
 
         if parts[0] == "section":

-            # Just need to add the section title to the breadcrumb
-            section = BlogSection.objects.get(slug__exact=parts[1])
-            breadcrumb.append({'url': section.get_absolute_url(), 'title': section.title})
+            # Just need to add the section title to the breadcrumb *if* we
+            # actually have a section
+            if len(parts) > 1:
+                try:
+                    section = BlogSection.objects.get(slug__exact=parts[1])
+                    breadcrumb.append({'url': section.get_absolute_url(), 'title': section.title})
+                except:
+                    pass

 
         if len(parts) == 5 and  \
             parts[0].isdigit() and \
 
         if len(parts) == 5 and  \
             parts[0].isdigit() and \