[MERGE]Merge trunk-website-al.

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

1 files changed, 6 insertions, 5 deletions

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index ec9d56632f5..b3aaf611ddc 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -181,11 +181,12 @@ class website(osv.osv):
                 logger.error("Website Rendering Error.\n\n%s" % traceback.format_exc())
                 return self.render(cr, uid, ids, 'website.404', qweb_context)
 
-        try:
-            main_object = request.registry[view_ref[0]].browse(cr, uid, view_ref[1])
-            qweb_context['main_object'] = main_object
-        except Exception:
-            pass
+        if 'main_object' not in qweb_context:
+            try:
+                main_object = request.registry[view_ref[0]].browse(cr, uid, view_ref[1])
+                qweb_context['main_object'] = main_object
+            except Exception:
+                pass
 
         try:
             return view.render(