Merge pull request #3768 from annando/avoid-sql-error

Avoid SQL error when in Forum view
This commit is contained in:
rabuzarus 2017-10-07 23:58:15 +02:00 committed by GitHub
commit 2ac3db7607

View file

@ -856,11 +856,12 @@ function networkThreadedView(App $a, $update = 0) {
if (!$group && !$cid && !$star) { if (!$group && !$cid && !$star) {
$condition = array('unseen' => true, 'uid' => local_user()); $condition = array('unseen' => true, 'uid' => local_user());
networkSetSeen($condition);
} elseif ($parents_str) { } elseif ($parents_str) {
$condition = array("`uid` = ? AND `unseen` AND `parent` IN (" . dbesc($parents_str) . ")", local_user()); $condition = array("`uid` = ? AND `unseen` AND `parent` IN (" . dbesc($parents_str) . ")", local_user());
networkSetSeen($condition);
} }
networkSetSeen($condition);
$mode = 'network'; $mode = 'network';
$o .= networkConversation($a, $items, $mode, $update); $o .= networkConversation($a, $items, $mode, $update);