aboutsummaryrefslogtreecommitdiffstats
path: root/include/event.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-01-09 17:05:39 -0800
committerzotlabs <mike@macgirvin.com>2018-01-09 17:05:39 -0800
commitf0798f78333ef52c0859a57c71fd7502923b4242 (patch)
treef9c8b55df5c95cf6c338250990bd78ea4e575c87 /include/event.php
parent75804d7ce57a476c85a486c807ea1f5a75235a0e (diff)
parentef7225b4f68ce032184e73b4af7444c90d1109a5 (diff)
downloadvolse-hubzilla-f0798f78333ef52c0859a57c71fd7502923b4242.tar.gz
volse-hubzilla-f0798f78333ef52c0859a57c71fd7502923b4242.tar.bz2
volse-hubzilla-f0798f78333ef52c0859a57c71fd7502923b4242.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/event.php')
-rw-r--r--include/event.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/event.php b/include/event.php
index 282c1a9d7..c1cf59425 100644
--- a/include/event.php
+++ b/include/event.php
@@ -6,6 +6,8 @@
use Sabre\VObject;
+require_once('include/bbcode.php');
+
/**
* @brief Returns an event as HTML.
*
@@ -14,7 +16,6 @@ use Sabre\VObject;
*/
function format_event_html($ev) {
- require_once('include/bbcode.php');
if(! ((is_array($ev)) && count($ev)))
return '';
@@ -192,7 +193,7 @@ function format_todo_ical($ev) {
function format_ical_text($s) {
- require_once('include/bbcode.php');
+
require_once('include/html2plain.php');
$s = html2plain(bbcode($s));
@@ -983,7 +984,6 @@ function event_store_item($arr, $event) {
require_once('include/datetime.php');
require_once('include/items.php');
- require_once('include/bbcode.php');
$item = null;