diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-09-21 12:45:32 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-09-21 12:45:32 +0200 |
| commit | 46d6d1c329e52e7e705374f56d1a8da6277aa454 (patch) | |
| tree | 846eeb249bf2393eed334d328b40d38e8154cda3 | |
| parent | 4dd1521677851cb88a497cb5710fb272d9d4fc9d (diff) | |
| parent | ba49e6a5889ffbb91ce783a00334d2b6221c42b7 (diff) | |
| download | volse-hubzilla-46d6d1c329e52e7e705374f56d1a8da6277aa454.tar.gz volse-hubzilla-46d6d1c329e52e7e705374f56d1a8da6277aa454.tar.bz2 volse-hubzilla-46d6d1c329e52e7e705374f56d1a8da6277aa454.zip | |
Merge remote-tracking branch 'mike/master' into dev
| -rw-r--r-- | Zotlabs/Module/Bookmarks.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Cal.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Events.php | 5 | ||||
| -rw-r--r-- | include/bookmarks.php | 5 |
4 files changed, 8 insertions, 6 deletions
diff --git a/Zotlabs/Module/Bookmarks.php b/Zotlabs/Module/Bookmarks.php index cea0d9759..cee86a47d 100644 --- a/Zotlabs/Module/Bookmarks.php +++ b/Zotlabs/Module/Bookmarks.php @@ -59,7 +59,7 @@ class Bookmarks extends \Zotlabs\Web\Controller { killme(); } - function get() { + function get() { if(! local_channel()) { notice( t('Permission denied.') . EOL); return; diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php index 87c13ef4e..14c109515 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',false); $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..213fa6bff 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',false); $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'),'',''), ); - - } } diff --git a/include/bookmarks.php b/include/bookmarks.php index 0db103054..21456c871 100644 --- a/include/bookmarks.php +++ b/include/bookmarks.php @@ -59,9 +59,10 @@ function bookmark_add($channel,$sender,$taxonomy,$private,$opts = null) { ); if($r) logger('add_bookmark: duplicate menu entry', LOGGER_DEBUG); - if(! $r) + if(! $r) { $r = menu_add_item($menu_id,$channel_id,$iarr); - + menu_sync_packet($channel_id,get_observer_hash(),$menu_id); + } return $r; } |