diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-06-24 11:25:20 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-06-24 11:25:20 +0200 |
| commit | c8ae04a96a38b7351c2ac506c836bb9b1734d58e (patch) | |
| tree | b15646cc7746f8b18dc844a9d7c8836c29bc7896 /Zotlabs/Module/Connedit.php | |
| parent | 39b14b6b811ec65f8c8a812397f9ee04877cd53d (diff) | |
| parent | c809b6f95e0c9717cba9cfad62b74104fbcc878d (diff) | |
| download | volse-hubzilla-c8ae04a96a38b7351c2ac506c836bb9b1734d58e.tar.gz volse-hubzilla-c8ae04a96a38b7351c2ac506c836bb9b1734d58e.tar.bz2 volse-hubzilla-c8ae04a96a38b7351c2ac506c836bb9b1734d58e.zip | |
Merge branch 'dev' into sabre32
Diffstat (limited to 'Zotlabs/Module/Connedit.php')
| -rw-r--r-- | Zotlabs/Module/Connedit.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 3feba5370..feed9cb1a 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -219,7 +219,7 @@ class Connedit extends \Zotlabs\Web\Controller { //Update profile photo permissions logger('A new profile was assigned - updating profile photos'); - profile_photo_set_profile_perms($profile_id); + profile_photo_set_profile_perms(local_channel(),$profile_id); } @@ -345,7 +345,7 @@ class Connedit extends \Zotlabs\Web\Controller { unset($clone['abook_account']); unset($clone['abook_channel']); - $abconfig = load_abconfig($channel['channel_hash'],$clone['abook_xchan']); + $abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']); if($abconfig) $clone['abconfig'] = $abconfig; |