Merge pull request buildinternet#85 from matt-richardson/master

Bug fix for data.photoset.owner null

Author: samdunn

flickr/js/supersized.flickr.1.1.2.js

@@ -167,7 +167,7 @@
     			    //create image urls
     			    var photoURL = 'http://farm' + item.farm + '.static.flickr.com/' + item.server + '/' + item.id + '_' + item.secret + '_' + options.image_size + '.jpg';
     			    var thumbURL = 'http://farm' + item.farm + '.static.flickr.com/' + item.server + '/' + item.id + '_' + item.secret + '_t.jpg';
-    			   	var	photoLink = "http://www.flickr.com/photos/" + data.photoset.owner + "/" + item.id + "/";
+    			    var photoLink = "http://www.flickr.com/photos/" + (data.photoset ? data.photoset.owner : item.owner) + "/" + item.id + "/";
 
     			    if (i == 0){
     			    	options.slides.splice(0,1,{ image : photoURL, thumb : thumbURL, title : item.title , url : photoLink });
@@ -560,7 +560,7 @@
 						if ((browserheight/browserwidth) > ratio){
 							options.fit_landscape && ratio <= 1 ? resizeWidth() : resizeHeight();	//If landscapes are set to fit
 						} else {
-							options.fit_portrait && ratio > 1 ? resizeHeight() : resizeWidth();		//If portraits are set to fit
+							options.fit_portrait && ratio >= 1 ? resizeHeight() : resizeWidth();		//If portraits are set to fit
 						}
 
 					}