show correct profile photo when previewing and editing profiles

include/channel.php

@@ -1303,6 +1303,14 @@ function profile_load($nickname, $profile = '') {
 				dbesc($nickname),
 				dbesc($profile)
 		);
+		if (! $p) {
+			$p = q("SELECT profile.uid AS profile_uid, profile.*, channel.* FROM profile
+				LEFT JOIN channel ON profile.uid = channel.channel_id
+				WHERE channel.channel_address = '%s' AND profile.id = %d LIMIT 1",
+				dbesc($nickname),
+				intval($profile)
+			);
+		}
 	}
 
 	if(! $p) {