From 41bac941620ebbe89dcbc171c0a7a73ad874901a Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Mon, 28 Sep 2020 10:45:41 +0000
Subject: [PATCH] [FIX] website_[blog, forum]: fix loop in retro compatible
 routes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Purpose of the retro-compatibility route was to redirect the old to the new.
And not redirect to themself and create a loop

closes odoo/odoo#58672

X-original-commit: b5e1bafeb42e94b587c245e9e7aa844770a129c6
Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
---
 addons/website_blog/controllers/main.py  | 2 +-
 addons/website_forum/controllers/main.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index 044b9f8a64b..17968fb81a9 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -201,7 +201,7 @@ class WebsiteBlog(http.Controller):
     ], type='http', auth="public", website=True, sitemap=False)
     def old_blog_post(self, blog, blog_post, tag_id=None, page=1, enable_editor=None, **post):
         # Compatibility pre-v14
-        return request.redirect(_build_url_w_params("/blog/%s/post/%s" % (slug(blog), slug(blog_post)), request.params), code=301)
+        return request.redirect(_build_url_w_params("/blog/%s/%s" % (slug(blog), slug(blog_post)), request.params), code=301)
 
     @http.route([
         '''/blog/<model("blog.blog"):blog>/<model("blog.post", "[('blog_id','=',blog.id)]"):blog_post>''',
diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 1c9c5972e6e..bf1276ee3bd 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -226,7 +226,7 @@ class WebsiteForum(WebsiteProfile):
                 type='http', auth="public", website=True, sitemap=False)
     def old_question(self, forum, question, **post):
         # Compatibility pre-v14
-        return request.redirect(_build_url_w_params("/forum/%s/question/%s" % (slug(forum), slug(question)), request.params), code=301)
+        return request.redirect(_build_url_w_params("/forum/%s/%s" % (slug(forum), slug(question)), request.params), code=301)
 
     @http.route(['''/forum/<model("forum.forum"):forum>/<model("forum.post", "[('forum_id','=',forum.id),('parent_id','=',False),('can_view', '=', True)]"):question>'''],
                 type='http', auth="public", website=True, sitemap=True)