Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

2 files changed, 27 insertions, 24 deletions

diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index 96a4e1f40..6912322aa 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -71,29 +71,32 @@ class Photo extends \Zotlabs\Web\Controller {
 			$modified = filemtime($default);
 			$default = z_root() . '/' . $default;
 			$uid = $person;
+			
+			$data = '';
 
-			$d = [ 'imgscale' => $resolution, 'channel_id' => $uid, 'default' => $default, 'data'  => '', 'mimetype' => '' ];
-			call_hooks('get_profile_photo',$d);
-
-			$resolution = $d['imgscale'];
-			$uid        = $d['channel_id']; 	
-			$default    = $d['default'];
-			$data       = $d['data'];
-			$mimetype   = $d['mimetype'];
-
+			$r = q("SELECT * FROM photo WHERE imgscale = %d AND uid = %d AND photo_usage = %d LIMIT 1",
+				intval($resolution),
+				intval($uid),
+				intval(PHOTO_PROFILE)
+			);
+			if($r) {
+			    $modified = strtotime($r[0]['edited'] . "Z");
+			    $mimetype = $r[0]['mimetype'];
+			    if(intval($r[0]['os_storage']))
+			        $data = file_get_contents($data);
+			    else
+			        $data = dbunescbin($r[0]['content']);
+			}
+				
 			if(! $data) {
-				$r = q("SELECT * FROM photo WHERE imgscale = %d AND uid = %d AND photo_usage = %d LIMIT 1",
-					intval($resolution),
-					intval($uid),
-					intval(PHOTO_PROFILE)
-				);
-				if($r) {
-					$modified = strtotime($r[0]['edited'] . "Z");
-					$data = dbunescbin($r[0]['content']);
-					$mimetype = $r[0]['mimetype'];
-				}
-				if(intval($r[0]['os_storage']))
-					$data = file_get_contents($data);
+			    $d = [ 'imgscale' => $resolution, 'channel_id' => $uid, 'default' => $default, 'data'  => '', 'mimetype' => '' ];
+			    call_hooks('get_profile_photo',$d);
+			    
+			    $resolution = $d['imgscale'];
+			    $uid        = $d['channel_id']; 	
+			    $default    = $d['default'];
+			    $data       = $d['data'];
+			    $mimetype   = $d['mimetype'];
 			}
 
 			if(! $data) {
diff --git a/include/permissions.php b/include/permissions.php
index 115d96eca..1dcd6accb 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -192,7 +192,7 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_
 
 		// They are in your address book, but haven't been approved
 
-		if($channel_perm & PERMS_PENDING) {
+		if($channel_perm & PERMS_PENDING && (! intval($x[0]['abook_pseudo']))) {
 			$ret[$perm_name] = true;
 			continue;
 		}
@@ -316,6 +316,7 @@ function perm_is_allowed($uid, $observer_xchan, $permission, $check_siteblock =
 
 			if(! $x) {
 				// not in address book and no guest token, see if they've got an xchan
+
 				$y = q("select xchan_network from xchan where xchan_hash = '%s' limit 1",
 					dbesc($observer_xchan)
 				);
@@ -327,7 +328,6 @@ function perm_is_allowed($uid, $observer_xchan, $permission, $check_siteblock =
 		}
 		$abperms = load_abconfig($uid,$observer_xchan,'my_perms');
 	}
-	
 
 	// system is blocked to anybody who is not authenticated
 
@@ -382,7 +382,7 @@ function perm_is_allowed($uid, $observer_xchan, $permission, $check_siteblock =
 
 	// They are in your address book, but haven't been approved
 
-	if($channel_perm & PERMS_PENDING) {
+	if($channel_perm & PERMS_PENDING && (! intval($x[0]['abook_pseudo']))) {
 		return true;
 	}