diff options
| author | Mario <mario@mariovavti.com> | 2019-08-16 19:32:08 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-08-16 19:32:08 +0200 |
| commit | ea8621d6ece810479adc0cd785212d66cbe01d23 (patch) | |
| tree | 32350070ec5601282afe4411486c629ce14e1a2e /include/channel.php | |
| parent | b325b2c003ae73c8c9869d35b15444fe9a17fd74 (diff) | |
| parent | ac05a2ede7023495618b316635b93274416b69d8 (diff) | |
| download | volse-hubzilla-ea8621d6ece810479adc0cd785212d66cbe01d23.tar.gz volse-hubzilla-ea8621d6ece810479adc0cd785212d66cbe01d23.tar.bz2 volse-hubzilla-ea8621d6ece810479adc0cd785212d66cbe01d23.zip | |
Merge branch 'dev' into 'dev'
zot6 compatibility: when posting from a non-primary clone the actor->id is...
See merge request hubzilla/core!1710
Diffstat (limited to 'include/channel.php')
| -rw-r--r-- | include/channel.php | 10 |
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) { |