more permissions work

2 files changed, 4 insertions, 2 deletions

diff --git a/include/config.php b/include/config.php
index ece22793f..91e021947 100644
--- a/include/config.php
+++ b/include/config.php
@@ -99,7 +99,7 @@ function del_aconfig($account_id, $family, $key) {
 
 
 function load_abconfig($chan,$xhash) {
-	Zlib\AbConfig::Load($chan,$xhash);
+	return Zlib\AbConfig::Load($chan,$xhash);
 }
 
 function get_abconfig($chan,$xhash,$family,$key) {
diff --git a/include/permissions.php b/include/permissions.php
index 5eb602ce0..8e2f9598b 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -81,6 +81,8 @@ function get_all_perms($uid, $observer_xchan, $internal_use = true) {
 
 	$ret = array();
 
+	$abperms = (($uid && $observer_xchan) ? load_abconfig($uid,$observer_xchan) : false);
+
 	foreach($global_perms as $perm_name => $permission) {
 
 		// First find out what the channel owner declared permissions to be.
@@ -122,7 +124,7 @@ function get_all_perms($uid, $observer_xchan, $internal_use = true) {
 						dbesc($observer_xchan)
 					);
 				}
-				$abperms = load_abconfig($uid,$observer_xchan);
+
 				$abook_checked = true;
 			}