Normalize item like/dislike template variable name

diff --git a/include/conversation.php b/include/conversation.php
index 0c007851cd471b4c8892b156d7cb756a32990f6b..d496e5bb7cdb4154a4c8f7ab335a9c76d94e15d3 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -626,8 +626,8 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        'star' => $star,
                                        'drop' => $drop,
                                        'vote' => $likebuttons,
-                                       'like' => '',
-                                       'dislike' => '',
+                                       'like_html' => '',
+                                       'dislike_html' => '',
                                        'comment_html' => '',
                                        'conv' => (($preview) ? '' : ['href'=> 'display/'.$item['guid'], 'title'=> DI::l10n()->t('View in context')]),
                                        'previewing' => $previewing,

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 70142e887f913939b327792e4180f260bb0b55a6..c3b93b1a02e83311ff1d55accdec69d07f0dd5a3 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -474,8 +474,8 @@ class Post
                        'filer'           => $filer,
                        'drop'            => $drop,
                        'vote'            => $buttons,
-                       'like'            => $responses['like']['output'],
-                       'dislike'         => $responses['dislike']['output'],
+                       'like_html'       => $responses['like']['output'],
+                       'dislike_html'    => $responses['dislike']['output'],
                        'responses'       => $responses,
                        'switchcomment'   => DI::l10n()->t('Comment'),
                        'reply_label'     => DI::l10n()->t('Reply to %s', $name_e),

diff --git a/view/theme/quattro/templates/search_item.tpl b/view/theme/quattro/templates/search_item.tpl
index e05e37621e1b6608898fb4d9f656a7e839b9f87f..a7e755747ec692d7e21af69b1b7105870cb7ce3a 100644 (file)
--- a/view/theme/quattro/templates/search_item.tpl
+++ b/view/theme/quattro/templates/search_item.tpl
@@ -82,8 +82,8 @@
        </div>
        <div class="wall-item-bottom">
                <div class="wall-item-links"></div>
-               <div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like nofilter}}</div>
-               <div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike nofilter}}</div>
+               <div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like_html nofilter}}</div>
+               <div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike_html nofilter}}</div>
                {{if $item.conv}}
                <div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
                        <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>

diff --git a/view/theme/smoothly/templates/wall_thread.tpl b/view/theme/smoothly/templates/wall_thread.tpl
index 0cd52fcdeaa2d93621d26766d686eae571e89680..c9f258f6fdcb45d153b2759f7cbcc7f4188ef81e 100644 (file)
--- a/view/theme/smoothly/templates/wall_thread.tpl
+++ b/view/theme/smoothly/templates/wall_thread.tpl
@@ -143,8 +143,8 @@
 
        </div>
        <div class="wall-item-wrapper-end"></div>
-       <div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like nofilter}}</div>
-       <div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike nofilter}}</div>
+       <div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like_html nofilter}}</div>
+       <div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike_html nofilter}}</div>
 
        {{if $item.threaded}}
        {{if $item.comment_html}}

diff --git a/view/theme/vier/templates/search_item.tpl b/view/theme/vier/templates/search_item.tpl
index 278beb01745bde521e70774e214021bf6af07bee..fd3a0a53691f8bd11e4540afee53786f08c223d7 100644 (file)
--- a/view/theme/vier/templates/search_item.tpl
+++ b/view/theme/vier/templates/search_item.tpl
@@ -89,7 +89,7 @@
        </div>
        <div class="wall-item-bottom">
                <div class="wall-item-links"></div>
-               <div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like nofilter}}</div>
-               <div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike nofilter}}</div>
+               <div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like_html nofilter}}</div>
+               <div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike_html nofilter}}</div>
        </div>
 </div>