aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-08-15 19:18:46 -0700
committerzotlabs <mike@macgirvin.com>2019-08-15 19:18:46 -0700
commit808baf203d8c7aa57d89a3d5412742a4c84934b6 (patch)
tree4a5eb0cd0c337c2b6c31733cbf73cc6782bba666
parentbeeafc6bc5eb1d564a60986bbc2de3f7b06bfdc1 (diff)
downloadvolse-hubzilla-808baf203d8c7aa57d89a3d5412742a4c84934b6.tar.gz
volse-hubzilla-808baf203d8c7aa57d89a3d5412742a4c84934b6.tar.bz2
volse-hubzilla-808baf203d8c7aa57d89a3d5412742a4c84934b6.zip
show correct profile photo when previewing and editing profiles
-rw-r--r--include/channel.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/include/channel.php b/include/channel.php
index 0280cd1cd..7c0397e11 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1262,7 +1262,7 @@ function channel_export_items_page($channel_id, $start, $finish, $page = 0, $lim
*/
function profile_load($nickname, $profile = '') {
-// logger('profile_load: ' . $nickname . (($profile) ? ' profile: ' . $profile : ''));
+ //logger('profile_load: ' . $nickname . (($profile) ? ' profile: ' . $profile : ''));
$user = q("select channel_id from channel where channel_address = '%s' and channel_removed = 0 limit 1",
dbesc($nickname)
@@ -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) {