Resolves OSQA-704, try to recreate the SMTP connection after exception has occurred.

[osqa.git] / forum / feed.py

diff --git a/forum/feed.py b/forum/feed.py
index 72e085d82408bb1160b9fddb54f9eb336d6aefbe..f22cbc94df615d039cdf799c1b66d52e308d1ebd 100644 (file)
--- a/forum/feed.py
+++ b/forum/feed.py
@@ -15,7 +15,7 @@ from forum.utils.pagination import generate_uri
 
 @decorate(add_domain, needs_origin=False)
 def add_domain(domain, url, *args, **kwargs):
-    return "%s%s" % (settings.APP_URL, url)
+    return "%s%s" % (settings.APP_BASE_URL, url)
 
 class BaseNodeFeed(Feed):
     if old_version:
@@ -67,7 +67,7 @@ class BaseNodeFeed(Feed):
 
 class RssQuestionFeed(BaseNodeFeed):
     def __init__(self, request, question_list, title, description):
-        url = request.path + "&" + generate_uri(request.GET, (_('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