From: Javyer Der Derian <javier@tribalo.net>
Date: Thu, 17 Apr 2014 21:57:03 +0000 (-0300)
Subject: Merge pull request #44 from udacity/merge_small_prs
X-Git-Tag: live~25
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/9162dea1adb758b31ab40323d28ca585ed667eaf?hp=59dffb0a68d8b284e3e0111b78f6e35d81fdf4c1

Merge pull request #44 from udacity/merge_small_prs

Merge small prs
---

diff --git a/forum/views/meta.py b/forum/views/meta.py
index a47cf1d..e7d1515 100644
--- a/forum/views/meta.py
+++ b/forum/views/meta.py
@@ -37,7 +37,7 @@ def static(request, title, content):
 def media(request, skin, path):
     response = serve(request, "%s/media/%s" % (skin, path),
                  document_root=os.path.join(os.path.dirname(os.path.dirname(__file__)), 'skins').replace('\\', '/'))
-    content_type = response['Content-Type']
+    content_type = response.get('Content-Type', '')
     if ('charset=' not in content_type):
         if (content_type.startswith('text') or content_type=='application/x-javascript'):
             content_type += '; charset=utf-8'
diff --git a/forum/views/readers.py b/forum/views/readers.py
index 669eaf3..a8b94e9 100644
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -8,6 +8,7 @@ from django.core.paginator import Paginator, EmptyPage, InvalidPage
 from django.template import RequestContext
 from django import template
 from django.utils.html import *
+from django.utils.http import urlquote
 from django.db.models import Q, Count
 from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse
diff --git a/forum_modules/akismet/startup.py b/forum_modules/akismet/startup.py
index 2387e05..c050754 100644
--- a/forum_modules/akismet/startup.py
+++ b/forum_modules/akismet/startup.py
@@ -1,5 +1,4 @@
 import json
-import loggin
 
 from django.utils.translation import ugettext as _
 from django.http import HttpResponse, HttpResponseRedirect