Merge branch 'master' of https://github.com/unaio/una

modules/boonex/timeline/classes/BxTimelineTemplate.php

@@ -1149,8 +1149,7 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
                 'condition' => !isset($aParams['show_counter_label_icon']) || (bool)$aParams['show_counter_label_icon'] === true,
                 'content' => array(
                     'style_prefix' => $sStylePrefix,
-                    'name' => $this->_getCounterIcon($aParams),
-                    'emoji' => ''
+                    'icon' => $this->_getCounterIcon($aParams),
                 )
             ),
             'bx_if:show_text' => array(
@@ -3118,7 +3117,7 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
 
     protected function _getCounterIcon($aParams = array())
     {
-        return 'redo';
+        return $this->parseHtmlByName('repost_counter_icon.html', ['emoji' => '']);
     }
 
     protected function _getCounterLabel($iCount, $aParams = array())

modules/boonex/timeline/template/repost_counter_icon.html

@@ -0,0 +1 @@
+<i class="sys-icon redo">__emoji__</i>

template/scripts/BxBaseVoteReactions.php

@@ -425,7 +425,8 @@ class BxBaseVoteReactions extends BxDolVoteReactions
                 'content' => array(
                     'style_prefix' => $this->_sStylePrefix,
                     'name' => $this->getIcon($sReaction),
-                    'emoji' => $this->getEmoji($sReaction)
+                    'emoji' => $this->getEmoji($sReaction),
+                    'title_attr' => bx_html_attribute(_t($this->_aDataList[$sReaction]['title'])),
                 )
             ),
             'bx_if:show_text' => array(