diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-01 22:34:31 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-01 22:34:31 -0700 |
| commit | f23c8e7597b6d96639738d0180e8cb277682ce23 (patch) | |
| tree | ffcb15dd536800b67c9918756e41bb4accde3320 /include/zot.php | |
| parent | e539a9e7bdd035f96d8e8406e3433d34d99435da (diff) | |
| parent | 11cdc36bcc7414002c2e72fd0c45d285d9515f0c (diff) | |
| download | volse-hubzilla-f23c8e7597b6d96639738d0180e8cb277682ce23.tar.gz volse-hubzilla-f23c8e7597b6d96639738d0180e8cb277682ce23.tar.bz2 volse-hubzilla-f23c8e7597b6d96639738d0180e8cb277682ce23.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/zot.php b/include/zot.php index dad30dbb0..5270ed8b8 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3649,6 +3649,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { $disallowed = array('id','aid','uid','guid'); foreach($arr['profile'] as $profile) { + $x = q("select * from profile where profile_guid = '%s' and uid = %d limit 1", dbesc($profile['profile_guid']), intval($channel['channel_id']) @@ -3671,6 +3672,9 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { if(in_array($k,$disallowed)) continue; + if($profile['is_default'] && in_array($k,['photo','thumb'])) + continue; + if($k === 'name') $clean['fullname'] = $v; elseif($k === 'with') |