Merge remote-tracking branch 'mike/master' into dev

This commit is contained in:
Mario Vavti
2019-02-07 09:34:22 +01:00
8 changed files with 132 additions and 61 deletions

View File

@@ -304,8 +304,10 @@ class ThreadItem {
$dislike = array( t("I don't like this \x28toggle\x29"), t("dislike"));
}
if ($shareable)
$share = array( t('Share This'), t('share'));
if ($shareable) {
$share = array( t('Repeat This'), t('repeat'));
$embed = array( t('Share This'), t('share'));
}
$dreport = '';
@@ -419,6 +421,7 @@ class ThreadItem {
'like' => $like,
'dislike' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike : ''),
'share' => $share,
'embed' => $embed,
'rawmid' => $item['mid'],
'plink' => get_plink($item),
'edpost' => $edpost, // ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''),