From 4cecbd919f858622c85426ef7fb61d06c36eeb19 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 12 May 2014 12:39:35 +0200
Subject: [PATCH] [FIX] mass_mailing,website*,survey: leftover calls to
 website.get_public_user()

This method was (partially) removed at rev.9421
rev-id al@openerp.com-20140507153223-q73u5lhyrfw98o3a

bzr revid: odo@openerp.com-20140512103935-o0ue9wzenm5wjejq
---
 addons/mass_mailing/controllers/main.py  | 3 +--
 addons/survey/controllers/main.py        | 2 +-
 addons/website_blog/controllers/main.py  | 4 +---
 addons/website_forum/controllers/main.py | 4 ++--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/mass_mailing/controllers/main.py b/addons/mass_mailing/controllers/main.py
index 935b51c612c..50ce0868d93 100644
--- a/addons/mass_mailing/controllers/main.py
+++ b/addons/mass_mailing/controllers/main.py
@@ -47,10 +47,9 @@ class MassMailController(http.Controller):
         Contacts = request.registry['mail.mass_mailing.contact']
         Users = request.registry['res.users']
 
-        public_id = request.registry['website'].get_public_user(cr, uid, context)
         is_subscriber = False
         email = None
-        if uid != public_id:
+        if uid != request.website.user_id.id:
             email = Users.browse(cr, SUPERUSER_ID, uid, context).email
         elif request.session.get('mass_mailing_email'):
             email = request.session['mass_mailing_email']
diff --git a/addons/survey/controllers/main.py b/addons/survey/controllers/main.py
index d6f23f503d9..69fa12222c5 100644
--- a/addons/survey/controllers/main.py
+++ b/addons/survey/controllers/main.py
@@ -45,7 +45,7 @@ class WebsiteSurvey(http.Controller):
             return werkzeug.utils.redirect("/survey/")
 
         # In case of auth required, block public user
-        if survey.auth_required and uid == request.registry['website'].get_public_user(cr, uid, context):
+        if survey.auth_required and uid == request.website.user_id.id:
             return request.website.render("website.403")
 
         # In case of non open surveys
diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index 133a95d0c8a..e33905272a3 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -244,10 +244,8 @@ class WebsiteBlog(http.Controller):
         blog_post = request.registry['blog.post']
         partner_obj = request.registry['res.partner']
         thread_obj = request.registry['mail.thread']
-        website = request.registry['website']
 
-        public_id = website.get_public_user(cr, uid, context)
-        if uid != public_id:
+        if uid != request.website.user_id.id:
             partner_ids = [user.partner_id.id]
         else:
             partner_ids = blog_post._find_partner_from_emails(
diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 2619a8bd828..2ff12c3d342 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -34,8 +34,8 @@ class WebsiteForum(http.Controller):
     def _prepare_forum_values(self, forum=None, **kwargs):
         Forum = request.registry['forum.forum']
         user = request.registry['res.users'].browse(request.cr, request.uid, request.uid, context=request.context)
-        public_uid = request.registry['website'].get_public_user(request.cr, request.uid, request.context)
-        values = {'user': user, 'is_public_user': user.id == public_uid,
+        values = {'user': user,
+                  'is_public_user': user.id == request.website.user_id.id,
                   'notifications': self._get_notifications(),
                   'header': kwargs.get('header', dict()),
                   'searches': kwargs.get('searches', dict()),