harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

multi-profiles work

Browse Source
This commit is contained in:
friendica
2013-07-03 02:47:36 -07:00
parent 8369a8a755
commit c16b65b5bd
4 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
boot.php
View File

@@ -1438,6 +1438,8 @@ function get_max_import_size() {
function profile_load(&$a, $nickname, $profile = '') {
logger('profile_load: ' . $profile);
$user = q("select channel_id from channel where channel_address = '%s' limit 1",
dbesc($nickname)
);
@@ -1460,12 +1462,13 @@ function profile_load(&$a, $nickname, $profile = '') {
return;
}
$r = q("SELECT abook_profile FROM abook WHERE abook_xchan = '%s' limit 1",
dbesc($observer['xchan_hash'])
);
if($r)
$profile = $r[0]['abook_profile'];
if(! $profile) {
$r = q("SELECT abook_profile FROM abook WHERE abook_xchan = '%s' limit 1",
dbesc($observer['xchan_hash'])
);
if($r)
$profile = $r[0]['abook_profile'];
}
$r = null;
if($profile) {