diff options
| author | friendica <info@friendica.com> | 2015-01-28 21:11:07 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-28 21:11:07 -0800 |
| commit | b9a760783d9e82650db7f9dbfd1e0e8ab678f2d6 (patch) | |
| tree | 75a839964f63227b84c86707dc25611d9f5be44f /include/widgets.php | |
| parent | 74f9544ed40b4d6110846d87fec16ca4102fca13 (diff) | |
| parent | 2039710962db42e0b85a1ab452f923b921bce1b4 (diff) | |
| download | volse-hubzilla-b9a760783d9e82650db7f9dbfd1e0e8ab678f2d6.tar.gz volse-hubzilla-b9a760783d9e82650db7f9dbfd1e0e8ab678f2d6.tar.bz2 volse-hubzilla-b9a760783d9e82650db7f9dbfd1e0e8ab678f2d6.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include/widgets.php')
| -rw-r--r-- | include/widgets.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/widgets.php b/include/widgets.php index 65c006409..523318850 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -642,7 +642,7 @@ function widget_bookmarkedchats($arr) { $h = get_observer_hash(); if(! $h) return; - $r = q("select * from xchat where xchat_xchan = '%s' group by xchat_url order by xchat_desc", + $r = q("select xchat_url, xchat_desc from xchat where xchat_xchan = '%s' order by xchat_desc", dbesc($h) ); if($r) { @@ -664,7 +664,7 @@ function widget_suggestedchats($arr) { $h = get_observer_hash(); if(! $h) return; - $r = q("select *, count(xchat_url) as total from xchat group by xchat_url order by total desc, xchat_desc limit 24"); + $r = q("select xchat_url, xchat_desc, count(xchat_xchan) as total from xchat group by xchat_url, xchat_desc order by total desc, xchat_desc limit 24"); if($r) { for($x = 0; $x < count($r); $x ++) { $r[$x]['xchat_url'] = zid($r[$x]['xchat_url']); |