odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Fixed conflict that I has not seen. 

bzr revid: tde@openerp.com-20120911121107-surc6mwhfldsa541
This commit is contained in:
Thibault Delavallée 2012-09-11 14:11:07 +02:00
parent dde8c1891d
commit 57f2b2f909
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/mail/static/src/js/mail.js
View File

@ -536,11 +536,7 @@ openerp.mail = function(session) {
},
display_user_avatar: function () {
<<<<<<< TREE
var avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
=======
var avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.session.uid);
>>>>>>> MERGE-SOURCE
return this.$el.find('img.oe_mail_icon').attr('src', avatar);
},