aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-10-19 15:40:13 -0700
committerfriendica <info@friendica.com>2012-10-19 15:40:13 -0700
commit112e4e6c9c807b834c34599a7602da33adfb410e (patch)
tree0a85b145522c56d7b7cfd9303f6649e2b19a5d01 /include
parentb60560812f1917b4cf197e35d7fdf2e3d7261a59 (diff)
downloadvolse-hubzilla-112e4e6c9c807b834c34599a7602da33adfb410e.tar.gz
volse-hubzilla-112e4e6c9c807b834c34599a7602da33adfb410e.tar.bz2
volse-hubzilla-112e4e6c9c807b834c34599a7602da33adfb410e.zip
more work on profile changes - the notify activity is still stuffed as we finalise the json structure for activitystream meta-data
Diffstat (limited to 'include')
-rw-r--r--include/security.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/security.php b/include/security.php
index 926b2a8fe..d1b3deca7 100644
--- a/include/security.php
+++ b/include/security.php
@@ -206,7 +206,7 @@ function change_channel($change_channel) {
$ret = false;
if($change_channel) {
- $r = q("select * from channel where channel_id = %d and channel_account_id = %d limit 1",
+ $r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel_id = %d and channel_account_id = %d limit 1",
intval($change_channel),
intval(get_account_id())
);