aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-07-03 03:18:04 -0700
committerfriendica <info@friendica.com>2013-07-03 03:18:04 -0700
commit765911172ee7e7290cae7a09265b532a5bc35c95 (patch)
treebbe71577d330beb9b1b4c729591d445e32e60a64
parentc16b65b5bd7f5a43647523ef9dd351a9edb17fde (diff)
downloadvolse-hubzilla-765911172ee7e7290cae7a09265b532a5bc35c95.tar.gz
volse-hubzilla-765911172ee7e7290cae7a09265b532a5bc35c95.tar.bz2
volse-hubzilla-765911172ee7e7290cae7a09265b532a5bc35c95.zip
multi-profile - bugs
-rwxr-xr-xboot.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index e11327d69..c6d68230f 100755
--- a/boot.php
+++ b/boot.php
@@ -1463,8 +1463,9 @@ function profile_load(&$a, $nickname, $profile = '') {
}
if(! $profile) {
- $r = q("SELECT abook_profile FROM abook WHERE abook_xchan = '%s' limit 1",
- dbesc($observer['xchan_hash'])
+ $r = q("SELECT abook_profile FROM abook WHERE abook_xchan = '%s' and abook_channel = '%d' limit 1",
+ dbesc($observer['xchan_hash']),
+ intval($user[0]['channel_id'])
);
if($r)
$profile = $r[0]['abook_profile'];