OSQA-533, fixed some W3C validation errors: closing <img /> tags, removed some unnece...

[osqa.git] / forum / feed.py

diff --git a/forum/feed.py b/forum/feed.py
index d91fc22c4e1b7b0d251cf2e3105d71c416650af3..02c309d364d67783f1c99ada4646efea9e6baded 100644 (file)
--- a/forum/feed.py
+++ b/forum/feed.py
@@ -11,10 +11,11 @@ from django.utils.safestring import mark_safe
 from models import Question
 from forum import settings
 from forum.modules import decorate
+from forum.utils.pagination import generate_uri
 
 @decorate(add_domain, needs_origin=False)
-def add_domain(domain, url):
-    return "%s%s" % (settings.APP_URL, url)
+def add_domain(domain, url, *args, **kwargs):
+    return "%s%s" % (settings.APP_BASE_URL, url)
 
 class BaseNodeFeed(Feed):
     if old_version:
@@ -66,7 +67,7 @@ class BaseNodeFeed(Feed):
 
 class RssQuestionFeed(BaseNodeFeed):
     def __init__(self, request, question_list, title, description):
-        url = request.path + "&" + "&".join(["%s=%s" % (k, v) for k, v in request.GET.items() if not k in (_('page'), _('pagesize'), _('sort'))])
+        url = request.path + "&" + generate_uri(request.GET, (_('page'), _('pagesize'), _('sort')))
         super(RssQuestionFeed, self).__init__(request, title, description, url)
 
         self._question_list = question_list