diff options
author | Brion Vibber <brion@pobox.com> | 2010-06-07 10:19:40 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-06-07 10:19:40 -0700 |
commit | d88b208edcb75ec864e09bb3ab29785b35064400 (patch) | |
tree | 6a3b2eb35fb792bffb7ebaf3b4f81fb1131466d1 /plugins/Mapstraction/usermap.js | |
parent | a7e33ac89df9f05b7497bfb34c6e69b3329a87e5 (diff) | |
parent | 41e9dba7297d43b7de0cb7665901869910d1047a (diff) |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
plugins/OpenID/openid.php
Diffstat (limited to 'plugins/Mapstraction/usermap.js')
-rw-r--r-- | plugins/Mapstraction/usermap.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/Mapstraction/usermap.js b/plugins/Mapstraction/usermap.js index 4b7a6c26b..53cfe6bb0 100644 --- a/plugins/Mapstraction/usermap.js +++ b/plugins/Mapstraction/usermap.js @@ -104,7 +104,7 @@ function showMapstraction(element, notices) { pt = new mxn.LatLonPoint(lat, lon); mkr = new mxn.Marker(pt); - mkr.setIcon(n['user']['profile_image_url']); + mkr.setIcon(n['user']['profile_image_url'], [24, 24]); mkr.setInfoBubble('<a href="'+ n['user']['profile_url'] + '">' + n['user']['screen_name'] + '</a>' + ' ' + n['html'] + '<br/><a href="'+ n['url'] + '">'+ n['created_at'] + '</a>'); |