aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-01-18 13:17:37 +0000
committerMario <mario@mariovavti.com>2020-01-18 13:17:37 +0000
commitbfae86bdb6d18f4238fe114485e24947ad7c7d75 (patch)
treeb85ccc4cd324a939d10b7a07263406849e22b039
parent66f6a1d186e62472ea69120da31675e2a45f790f (diff)
downloadvolse-hubzilla-bfae86bdb6d18f4238fe114485e24947ad7c7d75.tar.gz
volse-hubzilla-bfae86bdb6d18f4238fe114485e24947ad7c7d75.tar.bz2
volse-hubzilla-bfae86bdb6d18f4238fe114485e24947ad7c7d75.zip
more bdi tags
-rw-r--r--Zotlabs/Lib/Enotify.php10
-rw-r--r--Zotlabs/Lib/ThreadItem.php4
2 files changed, 7 insertions, 7 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index bc2710ee1..8834eedca 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -803,18 +803,18 @@ class Enotify {
localize_item($item);
if($item['shortlocalize']) {
- $itemem_text = $item['shortlocalize'];
+ $itemem_text = strip_tags($item['shortlocalize']);
}
elseif($item['localize']) {
- $itemem_text = $item['localize'];
+ $itemem_text = strip_tags($item['localize']);
}
else {
$itemem_text = (($item['item_thread_top'])
? t('created a new post')
- : sprintf( t('commented on %s\'s post'), $item['owner']['xchan_name']));
+ : sprintf( t('commented on %s\'s post'), '<bdi>' . strip_tags($item['owner']['xchan_name']) . '</bdi>'));
if($item['verb'] === ACTIVITY_SHARE) {
- $itemem_text = sprintf( t('repeated %s\'s post'), $item['author']['xchan_name']);
+ $itemem_text = sprintf( t('repeated %s\'s post'), '<bdi>' . strip_tags($item['author']['xchan_name']) . '</bdi>');
}
}
@@ -849,7 +849,7 @@ class Enotify {
//'b64mid' => ((in_array($item['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) ? 'b64.' . base64url_encode($item['thr_parent']) : 'b64.' . base64url_encode($item['mid'])),
'notify_id' => 'undefined',
'thread_top' => (($item['item_thread_top']) ? true : false),
- 'message' => strip_tags(bbcode($itemem_text)),
+ 'message' => $itemem_text,
// these are for the superblock addon
'hash' => $item[$who]['xchan_hash'],
'uid' => $item['uid'],
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index caceac7ef..ef7b4dbf2 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -377,7 +377,7 @@ class ThreadItem {
'template' => $this->get_template(),
'mode' => $mode,
'item_type' => intval($item['item_type']),
- 'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
+ //'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
'body' => $body['html'],
'tags' => $body['tags'],
'categories' => $body['categories'],
@@ -414,7 +414,7 @@ class ThreadItem {
'sparkle' => $sparkle,
'title' => $item['title'],
'title_tosource' => get_pconfig($conv->get_profile_owner(),'system','title_tosource'),
- 'ago' => relative_date($item['created']),
+ //'ago' => relative_date($item['created']),
'app' => $item['app'],
'str_app' => sprintf( t('from %s'), $item['app']),
'isotime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'c'),