Merge branch 'flickrfix' of http://github.com/ScottDowne/popcorn-js i…

…nto 0.1 Conflicts: index.html xml/webMadeMovies.xml
corbanbrook · Jul 6, 2010 · 0422296 · 0422296
2 parents 14e83df + 57e3694
commit 0422296
Show file tree

Hide file tree

Showing 2 changed files with 136 additions and 65 deletions.
diff --git a/popcorn.js b/popcorn.js
@@ -511,7 +511,7 @@
         border  = this.params.border || "0px";
 
     // This uses jquery
-    $.getJSON("http://api.flickr.com/services/feeds/photos_public.gne?id=" + this.params.userid + "@N00&lang=en-us&format=json&jsoncallback=?", function(data){
+    $.getJSON("http://api.flickr.com/services/feeds/photos_public.gne?id=" + this.params.userid + "&lang=en-us&format=json&jsoncallback=?", function(data){
       $.each(data.items, function(i, item) {
         if (i < count) {
           var link = document.createElement('a');