[MERGE] forward port of branch 9.0 up to cb79297

1 files changed, 9 insertions, 0 deletions

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index a97acb0fb4c..6bf3801a961 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -2,6 +2,7 @@
 
 import babel.dates
 import time
+import re
 import werkzeug.urls
 from datetime import datetime, timedelta
 from dateutil.relativedelta import relativedelta
@@ -162,6 +163,14 @@ class website_event(http.Controller):
         if '.' not in page:
             page = 'website_event.%s' % page
 
+        try:
+            request.website.get_template(page)
+        except ValueError:
+            # page not found
+            values['path'] = re.sub(r"^website_event\.", '', page)
+            values['from_template'] = 'website_event.default_page'  # .strip('website_event.')
+            page = 'website.page_404'
+
         return request.website.render(page, values)
 
     @http.route(['/event/<model("event.event"):event>'], type='http', auth="public", website=True)