[MERGE]Merge trunk-website-al.

bzr revid: bth@tinyerp.com-20131017131139-whjjmuin6g9cby9r

1 files changed, 3 insertions, 2 deletions

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 54091a0fbb2..16b76c58213 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -154,9 +154,10 @@ class website_event(http.Controller):
     @website.route(['/event/<int:event_id>'], type='http', auth="public", multilang=True)
     def event(self, event_id=None, **post):
         event_obj = request.registry['event.event']
+        event = event_obj.browse(request.cr, request.uid, event_id, dict(request.context, show_address_only=1))
         values = {
-            'event_id': event_obj.browse(request.cr, request.uid, event_id,
-                                         dict(request.context, show_address_only=1)),
+            'event_id': event,
+            'main_object': event,
             'range': range,
             'float': float,
         }