diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-25 06:30:15 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-25 06:30:15 -0500 |
| commit | 83a42afddf6e5ffd04028431b36aed6ecadf5b9d (patch) | |
| tree | 26d7251cd032fb627c80345cc9cbc4384a66f46f /Zotlabs/Module/Connedit.php | |
| parent | 780f83a118146cf67509574ac88024c2cb03cf3a (diff) | |
| parent | ec3651d216a5eafcb8019825bc6751e6ffa8c198 (diff) | |
| download | volse-hubzilla-83a42afddf6e5ffd04028431b36aed6ecadf5b9d.tar.gz volse-hubzilla-83a42afddf6e5ffd04028431b36aed6ecadf5b9d.tar.bz2 volse-hubzilla-83a42afddf6e5ffd04028431b36aed6ecadf5b9d.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
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; |