aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-01-05 15:27:38 -0800
committerfriendica <info@friendica.com>2013-01-05 15:27:38 -0800
commit472a9057316063b556981d5049cc678232a36dbb (patch)
tree2c75dee243b30bf8c2a9c0e7b7156eebd99e2576
parent5894a7db48179a1ff8752c7fdd264194f1297316 (diff)
downloadvolse-hubzilla-472a9057316063b556981d5049cc678232a36dbb.tar.gz
volse-hubzilla-472a9057316063b556981d5049cc678232a36dbb.tar.bz2
volse-hubzilla-472a9057316063b556981d5049cc678232a36dbb.zip
fix live update on channel page
-rw-r--r--mod/channel.php4
-rw-r--r--version.inc2
2 files changed, 3 insertions, 3 deletions
diff --git a/mod/channel.php b/mod/channel.php
index 8dab365d8..c8a8d38ba 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -135,17 +135,17 @@ function channel_content(&$a, $update = 0, $load = false) {
if(($update) && (! $load)) {
+
$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 ) AND ( item_flags & %d )
+ AND (item_flags & %d) AND ( item_flags & %d )
AND ((abook.abook_flags & %d) = 0 or abook.abook_flags is null)
$sql_extra
ORDER BY created DESC",
intval($a->profile['profile_uid']),
intval(ITEM_WALL),
intval(ITEM_UNSEEN),
- intval(ITEM_THREAD_TOP),
intval(ABOOK_FLAG_BLOCKED)
);
diff --git a/version.inc b/version.inc
index 694b7642f..9dde64255 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-01-04.190
+2013-01-05.191