aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Profperm.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-06-27 04:00:10 -0700
committerredmatrix <git@macgirvin.com>2016-06-27 04:00:10 -0700
commit85d2ad4aea106417dc3d8ce2429d13dd858c5201 (patch)
tree72e03b3fe379829a4e2f9c521366fb14e1eaa970 /Zotlabs/Module/Profperm.php
parentd5d5d78e3aded9a3238ccb7e93b4c6fd4b873331 (diff)
parent8d298d5a068845856c9827c0d2ea3f02f1399d72 (diff)
downloadvolse-hubzilla-85d2ad4aea106417dc3d8ce2429d13dd858c5201.tar.gz
volse-hubzilla-85d2ad4aea106417dc3d8ce2429d13dd858c5201.tar.bz2
volse-hubzilla-85d2ad4aea106417dc3d8ce2429d13dd858c5201.zip
Merge branch 'dev' into perms
Diffstat (limited to 'Zotlabs/Module/Profperm.php')
-rw-r--r--Zotlabs/Module/Profperm.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Profperm.php b/Zotlabs/Module/Profperm.php
index 33e9d1ece..b1da147c1 100644
--- a/Zotlabs/Module/Profperm.php
+++ b/Zotlabs/Module/Profperm.php
@@ -17,7 +17,7 @@ class Profperm extends \Zotlabs\Web\Controller {
$profile = \App::$argv[1];
- profile_load($a,$which,$profile);
+ profile_load($which,$profile);
}
@@ -97,7 +97,7 @@ class Profperm extends \Zotlabs\Web\Controller {
//Time to update the permissions on the profile-pictures as well
- profile_photo_set_profile_perms($profile['id']);
+ profile_photo_set_profile_perms(local_channel(),$profile['id']);
$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND abook_profile = '%s'",
intval(local_channel()),