diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-06 19:59:33 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-06 19:59:33 -0700 |
| commit | fa7a6203fbb5fe87c7a6675124a80e370a899385 (patch) | |
| tree | 4605ff194ffdef35aba7c5cc6c2fed4115e4c71e | |
| parent | 318643cf9a8b40fad98df58f6c262d6ae6a0c63b (diff) | |
| parent | 643f515eaf21c05e03f0f51a332c18e0acdc403d (diff) | |
| download | volse-hubzilla-fa7a6203fbb5fe87c7a6675124a80e370a899385.tar.gz volse-hubzilla-fa7a6203fbb5fe87c7a6675124a80e370a899385.tar.bz2 volse-hubzilla-fa7a6203fbb5fe87c7a6675124a80e370a899385.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
| -rw-r--r-- | Zotlabs/Module/Like.php | 2 | ||||
| -rw-r--r-- | view/tpl/cards.tpl | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php index c995079ce..b104a5f5f 100644 --- a/Zotlabs/Module/Like.php +++ b/Zotlabs/Module/Like.php @@ -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) ); diff --git a/view/tpl/cards.tpl b/view/tpl/cards.tpl index a06e2fd22..60e6163ae 100644 --- a/view/tpl/cards.tpl +++ b/view/tpl/cards.tpl @@ -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}} |