harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hubzilla issue #1013 - comments not displayed in single card/article view

Browse Source
This commit is contained in:
zotlabs 2018-03-22 15:38:00 -07:00 committed by Mario Vavti
parent ae9e64cedf
commit 9c512bb645
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Zotlabs/Module/Articles.php
View File

@ -129,19 +129,20 @@ class Articles extends \Zotlabs\Web\Controller {
$sql_extra = item_permissions_sql($owner); $sql_extra = item_permissions_sql($owner);
$sql_item = '';
if($selected_card) { if($selected_card) {
$r = q("select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and iconfig.v = '%s' limit 1", $r = q("select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and iconfig.v = '%s' limit 1",
dbesc($selected_card) dbesc($selected_card)
); );
if($r) { if($r) {
$sql_extra .= "and item.id = " . intval($r[0]['iid']) . " "; $sql_item = "and item.id = " . intval($r[0]['iid']) . " ";
} }
} }
$r = q("select * from item $r = q("select * from item
where item.uid = %d and item_type = %d where item.uid = %d and item_type = %d
$sql_extra order by item.created desc", $sql_extra $sql_item order by item.created desc",
intval($owner), intval($owner),
intval(ITEM_TYPE_ARTICLE) intval(ITEM_TYPE_ARTICLE)
); );

5
Zotlabs/Module/Cards.php
View File

@ -132,19 +132,20 @@ class Cards extends \Zotlabs\Web\Controller {
$sql_extra = item_permissions_sql($owner); $sql_extra = item_permissions_sql($owner);
$sql_item = '';
if($selected_card) { if($selected_card) {
$r = q("select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.v = '%s' limit 1", $r = q("select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.v = '%s' limit 1",
dbesc($selected_card) dbesc($selected_card)
); );
if($r) { if($r) {
$sql_extra .= "and item.id = " . intval($r[0]['iid']) . " "; $sql_item = "and item.id = " . intval($r[0]['iid']) . " ";
} }
} }
$r = q("select * from item $r = q("select * from item
where uid = %d and item_type = %d where uid = %d and item_type = %d
$sql_extra order by item.created desc", $sql_extra $sql_item order by item.created desc",
intval($owner), intval($owner),
intval(ITEM_TYPE_CARD) intval(ITEM_TYPE_CARD)
); );