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

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs 2017-09-06 19:59:33 -07:00
commit fa7a6203fb
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Like.php
View File

@ -255,7 +255,7 @@ class Like extends \Zotlabs\Web\Controller {
// get the item. Allow linked photos (which are normally hidden) to be liked // get the item. Allow linked photos (which are normally hidden) to be liked
$r = q("SELECT * FROM item WHERE id = %d $r = q("SELECT * FROM item WHERE id = %d
and item_type = 0 and item_deleted = 0 and item_unpublished = 0 and (item_type = 0 or item_type = 6) and item_deleted = 0 and item_unpublished = 0
and item_delayed = 0 and item_pending_remove = 0 and item_blocked = 0 LIMIT 1", and item_delayed = 0 and item_pending_remove = 0 and item_blocked = 0 LIMIT 1",
intval($item_id) intval($item_id)
); );

13
view/tpl/cards.tpl
View File

@ -1,9 +1,4 @@
<div class="generic-content-wrapper"> <div id="live-cards"></div>
<div class="section-title-wrapper"> {{$editor}}
<h2>{{$title}}</h2> {{$content}}
</div> {{$pager}}
<div id="live-cards"></div>
{{$editor}}
{{$content}}
</div>
{{$pager}}