Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
This commit is contained in:
commit
fa7a6203fb
@ -255,7 +255,7 @@ class Like extends \Zotlabs\Web\Controller {
|
||||
// get the item. Allow linked photos (which are normally hidden) to be liked
|
||||
|
||||
$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",
|
||||
intval($item_id)
|
||||
);
|
||||
|
@ -1,9 +1,4 @@
|
||||
<div class="generic-content-wrapper">
|
||||
<div class="section-title-wrapper">
|
||||
<h2>{{$title}}</h2>
|
||||
</div>
|
||||
<div id="live-cards"></div>
|
||||
{{$editor}}
|
||||
{{$content}}
|
||||
</div>
|
||||
{{$pager}}
|
||||
<div id="live-cards"></div>
|
||||
{{$editor}}
|
||||
{{$content}}
|
||||
{{$pager}}
|
||||
|
Reference in New Issue
Block a user