aboutsummaryrefslogtreecommitdiffstats
path: root/mod/channel.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-02-04 17:46:04 -0800
committerfriendica <info@friendica.com>2013-02-04 17:46:04 -0800
commitda388f4bc5bd3a1aaea3c54b94fe1f8e4cf10561 (patch)
treefe259a2abd9d7e07ecdbc64af822e69f817de7f5 /mod/channel.php
parentff0a73bf40d0503eb5a4d48be60666b73c47d4f9 (diff)
downloadvolse-hubzilla-da388f4bc5bd3a1aaea3c54b94fe1f8e4cf10561.tar.gz
volse-hubzilla-da388f4bc5bd3a1aaea3c54b94fe1f8e4cf10561.tar.bz2
volse-hubzilla-da388f4bc5bd3a1aaea3c54b94fe1f8e4cf10561.zip
fix new/search mod on network page, fix the parent queries on network and channel pages - which you probably didn't even notice were all stuffed up because the endless scroll made things right.
Diffstat (limited to 'mod/channel.php')
-rw-r--r--mod/channel.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/channel.php b/mod/channel.php
index c74b40c00..f3e247399 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -145,7 +145,7 @@ function channel_content(&$a, $update = 0, $load = false) {
if(($update) && (! $load)) {
- $r = q("SELECT distinct(parent) AS `item_id` from item
+ $r = q("SELECT distinct parent AS `item_id` from item
left join abook on item.author_xchan = abook.abook_xchan
WHERE uid = %d AND item_restrict = 0
AND (item_flags & %d) AND ( item_flags & %d )
@@ -178,7 +178,7 @@ function channel_content(&$a, $update = 0, $load = false) {
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
if($load) {
- $r = q("SELECT id AS item_id FROM item
+ $r = q("SELECT distinct id AS item_id FROM item
left join abook on item.author_xchan = abook.abook_xchan
WHERE uid = %d AND item_restrict = 0
AND (item_flags & %d) and (item_flags & %d)