Merge https://github.com/redmatrix/hubzilla into pending_merge

1 files changed, 28 insertions, 1 deletions

diff --git a/include/zot.php b/include/zot.php
index 793eb6b39..ed4bdc264 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -814,7 +814,34 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
 		if ($local) {
 			$ph = z_fetch_url($arr['photo'], true);
 			if ($ph['success']) {
-				import_channel_photo($ph['body'], $arr['photo_mimetype'], $local[0]['channel_account_id'],$local[0]['channel_id']);
+
+				$hash = import_channel_photo($ph['body'], $arr['photo_mimetype'], $local[0]['channel_account_id'], $local[0]['channel_id']);
+
+				if($hash) {
+					// unless proven otherwise
+					$is_default_profile = 1;
+
+					$profile = q("select is_default from profile where aid = %d and uid = %d limit 1",
+						intval($local[0]['channel_account_id']),
+						intval($local[0]['channel_id'])
+					);
+					if($profile) {
+						if(! intval($profile[0]['is_default']))
+							$is_default_profile = 0;
+					}
+
+					// If setting for the default profile, unset the profile photo flag from any other photos I own
+					if($is_default_profile) {
+						q("UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND resource_id != '%s' AND aid = %d AND uid = %d",
+							intval(PHOTO_NORMAL),
+							intval(PHOTO_PROFILE),
+							dbesc($hash),
+							intval($local[0]['channel_account_id']),
+							intval($local[0]['channel_id'])
+						);
+					}
+				}
+
 				// reset the names in case they got messed up when we had a bug in this function
 				$photos = array(
 					z_root() . '/photo/profile/l/' . $local[0]['channel_id'],