aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2019-02-07 09:34:22 +0100
committerMario Vavti <mario@mariovavti.com>2019-02-07 09:34:22 +0100
commitd70f0092f7369a87117898716893c16f8a09d4fe (patch)
treeadfa9afd69580d55af6daebcc388aa146a513f62 /Zotlabs/Lib
parent860dead9851116617a275fbe08e861ce5d8642f9 (diff)
parent7f6e4a9744b7b5293e1f0d25db8bb3ad17cd256d (diff)
downloadvolse-hubzilla-d70f0092f7369a87117898716893c16f8a09d4fe.tar.gz
volse-hubzilla-d70f0092f7369a87117898716893c16f8a09d4fe.tar.bz2
volse-hubzilla-d70f0092f7369a87117898716893c16f8a09d4fe.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Lib')
-rw-r--r--Zotlabs/Lib/Activity.php2
-rw-r--r--Zotlabs/Lib/ThreadItem.php7
2 files changed, 6 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 259419f54..bcbe53df7 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -236,7 +236,7 @@ class Activity {
$ret['id'] = ((strpos($i['mid'],'http') === 0) ? $i['mid'] : z_root() . '/item/' . urlencode($i['mid']));
if($i['title'])
- $ret['title'] = bbcode($i['title']);
+ $ret['name'] = $i['title'];
$ret['published'] = datetime_convert('UTC','UTC',$i['created'],ATOM_TIME);
if($i['created'] !== $i['edited'])
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 7ce0d0f9e..ba7217c8f 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -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 : ''),