Merge remote-tracking branch 'upstream/dev' into website-export

include/photos.php

@@ -715,6 +715,7 @@ function profile_photo_set_profile_perms($uid, $profileid = 0) {
 		if($profileid) {
 			$r = q("SELECT photo, profile_guid, id, is_default, uid
 				FROM profile WHERE uid = %d and ( profile.id = %d OR profile.profile_guid = '%s') LIMIT 1", 
+				intval($uid),
 				intval($profileid), 
 				dbesc($profileid)
 			);