aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-08-27 14:14:28 -0400
committerAndrew Manning <tamanning@zoho.com>2016-08-27 14:14:28 -0400
commit69ca27910118f017b0be8d8f2cde8c24428c54cd (patch)
treeb3fb3e160723a465eb3e562cb7ef8e2e2447ec54
parentddfc5209d3a8a4b10f66b0ae0497a269ff2bdde1 (diff)
parent40b2e24c6dd72c91bf14bf5f36c8f737756d594d (diff)
downloadvolse-hubzilla-69ca27910118f017b0be8d8f2cde8c24428c54cd.tar.gz
volse-hubzilla-69ca27910118f017b0be8d8f2cde8c24428c54cd.tar.bz2
volse-hubzilla-69ca27910118f017b0be8d8f2cde8c24428c54cd.zip
Merge remote-tracking branch 'upstream/dev' into website-export
-rw-r--r--include/photos.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/photos.php b/include/photos.php
index 9d15d3692..a3018816c 100644
--- a/include/photos.php
+++ b/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)
);