| -rw-r--r-- | content/flickr.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/content/flickr.js b/content/flickr.js index b5bfa43..75d1a72 100644 --- a/content/flickr.js +++ b/content/flickr.js @@ -252,15 +252,20 @@ Flickr.prototype = { o.secret, sfx, (sfx=='o')?o.originalformat:null ); }, get_photo_page_url: function(p) { - if(p instanceof Photo) // TODO: half wrong, what if no owner? - return this.photos_url + (p.owner.nsid?p.owner.nsid:this.user.nsid) + '/' + p.id; - else // TODO: take owner into account? + if(p instanceof Photo) { + // TODO: track photoset and user owner id from there? + // The approach below is sheerly wrong. + var o = this.user.nsid; + if(p.owner && p.owner.nsid) o = p.owner.nsid; + var rv = this.photos_url + o +'/' + p.id; + return rv; + }else // TODO: take owner into account? return this.photos_url + this.user.nsid + '/' + p; }, make_photo_url: function(p,sfx) { if(sfx=='p') return this.get_photo_page_url(p); else |