aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-09-20 22:43:01 -0700
committerzotlabs <mike@macgirvin.com>2018-09-20 22:43:01 -0700
commit5525f082e64bb942f8aae97d4976ea1ec0aa91ec (patch)
tree401db6070bcd7c5261f3eba7c94775296869d8ee
parenta4d987b45a841acaf9b825ecf466072b09a8c254 (diff)
downloadvolse-hubzilla-5525f082e64bb942f8aae97d4976ea1ec0aa91ec.tar.gz
volse-hubzilla-5525f082e64bb942f8aae97d4976ea1ec0aa91ec.tar.bz2
volse-hubzilla-5525f082e64bb942f8aae97d4976ea1ec0aa91ec.zip
remove bbcode from event hovertip
-rw-r--r--Zotlabs/Module/Cal.php2
-rw-r--r--Zotlabs/Module/Events.php5
2 files changed, 4 insertions, 3 deletions
diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php
index 87c13ef4e..3809064b0 100644
--- a/Zotlabs/Module/Cal.php
+++ b/Zotlabs/Module/Cal.php
@@ -6,6 +6,7 @@ require_once('include/bbcode.php');
require_once('include/datetime.php');
require_once('include/event.php');
require_once('include/items.php');
+require_once('include/html2plain.php');
class Cal extends \Zotlabs\Web\Controller {
@@ -293,6 +294,7 @@ class Cal extends \Zotlabs\Web\Controller {
}
$html = format_event_html($rr);
$rr['desc'] = zidify_links(smilies(bbcode($rr['desc'])));
+ $rr['description'] = htmlentities(html2plain(bbcode($rr['description'])),ENT_COMPAT,'UTF-8');
$rr['location'] = zidify_links(smilies(bbcode($rr['location'])));
$events[] = array(
'id'=>$rr['id'],
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php
index 33c8b8249..2115edde5 100644
--- a/Zotlabs/Module/Events.php
+++ b/Zotlabs/Module/Events.php
@@ -6,7 +6,7 @@ require_once('include/bbcode.php');
require_once('include/datetime.php');
require_once('include/event.php');
require_once('include/items.php');
-
+require_once('include/html2plain.php');
class Events extends \Zotlabs\Web\Controller {
@@ -641,6 +641,7 @@ class Events extends \Zotlabs\Web\Controller {
}
$html = format_event_html($rr);
$rr['desc'] = zidify_links(smilies(bbcode($rr['desc'])));
+ $rr['description'] = htmlentities(html2plain(bbcode($rr['description'])),ENT_COMPAT,'UTF-8');
$rr['location'] = zidify_links(smilies(bbcode($rr['location'])));
$events[] = array(
'id'=>$rr['id'],
@@ -659,8 +660,6 @@ class Events extends \Zotlabs\Web\Controller {
'html'=>$html,
'plink' => array($rr['plink'],t('Link to Source'),'',''),
);
-
-
}
}