Merge pull request #9 from Goldmund-Wyldebeast-Wunderliebe/master

no more recursive came_from redirection after logged_in
This commit is contained in:
Timo Stollenwerk 2012-07-12 03:35:33 -07:00
commit 19685db96b

View File

@ -99,7 +99,8 @@ class DeleteComment(BrowserView):
_("Comment deleted."), _("Comment deleted."),
type="info") type="info")
came_from = self.context.REQUEST.HTTP_REFERER came_from = self.context.REQUEST.HTTP_REFERER
if len(came_from) == 0: # if the referrer already has a came_from in it, don't redirect back
if len(came_from) == 0 or 'came_from=' in came_from:
came_from = content_object.absolute_url() came_from = content_object.absolute_url()
return self.context.REQUEST.RESPONSE.redirect(came_from) return self.context.REQUEST.RESPONSE.redirect(came_from)
@ -138,7 +139,8 @@ class PublishComment(BrowserView):
_("Comment approved."), _("Comment approved."),
type="info") type="info")
came_from = self.context.REQUEST.HTTP_REFERER came_from = self.context.REQUEST.HTTP_REFERER
if len(came_from) == 0: # if the referrer already has a came_from in it, don't redirect back
if len(came_from) == 0 or 'came_from=' in came_from:
came_from = content_object.absolute_url() came_from = content_object.absolute_url()
return self.context.REQUEST.RESPONSE.redirect(came_from) return self.context.REQUEST.RESPONSE.redirect(came_from)