X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/ecdd91c7d9c3530c3febe8ffaf6175221bdc999e..b0bfed453995222e1a9a88633e04d8d02e024f4b:/forum/views/readers.py

diff --git a/forum/views/readers.py b/forum/views/readers.py
index a16712e..7404b92 100644
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -126,8 +126,14 @@ def tag(request, tag):
                          mark_safe(_(u'Questions Tagged With %(tag)s') % {'tag': tag}),
                          False)
 
+    # If the return data type is not a dict just return it
+    if not isinstance(question_context, dict):
+        return question_context
+
+    question_context = dict(question_context)
+
     # Create the combined context
-    context = dict(question_context, **tag_context)
+    context = dict(question_context.items() + tag_context.items())
 
     return context