diff options
| author | Hubzilla <hubzilla@hz.macgirvin.com> | 2017-01-18 18:18:37 -0800 |
|---|---|---|
| committer | Hubzilla <hubzilla@hz.macgirvin.com> | 2017-01-18 18:18:37 -0800 |
| commit | d4e58e94f6777f0a7ab5733d889f29bdb9366b14 (patch) | |
| tree | fd199554fac5c1afad8e1257534fed9fddb6526d /Zotlabs | |
| parent | 6e504b7bc992bebabedfc22f4e9b80dd29761800 (diff) | |
| download | volse-hubzilla-d4e58e94f6777f0a7ab5733d889f29bdb9366b14.tar.gz volse-hubzilla-d4e58e94f6777f0a7ab5733d889f29bdb9366b14.tar.bz2 volse-hubzilla-d4e58e94f6777f0a7ab5733d889f29bdb9366b14.zip | |
native wiki updates
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/NativeWikiPage.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php index aa9365993..aa1510da8 100644 --- a/Zotlabs/Lib/NativeWikiPage.php +++ b/Zotlabs/Lib/NativeWikiPage.php @@ -541,7 +541,7 @@ class NativeWikiPage { $s = str_replace(array('[baseurl]', '[sitename]'), array(z_root(), get_config('system', 'sitename')), $s); - $observer = App::get_observer(); + $observer = \App::get_observer(); if ($observer) { $s1 = '<span class="bb_observer" title="' . t('Different viewers will see this text differently') . '">'; $s2 = '</span>'; diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 60a1fb665..9adcc91b0 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -39,7 +39,6 @@ class Wiki extends \Zotlabs\Web\Controller { return; } - require_once('include/wiki.php'); require_once('include/acl_selectors.php'); require_once('include/conversation.php'); require_once('include/bbcode.php'); @@ -239,8 +238,8 @@ class Wiki extends \Zotlabs\Web\Controller { } else { require_once('library/markdown.php'); - $html = wiki_generate_toc(zidify_text(purify_html(Markdown(wiki_bbcode(json_decode($content)))))); - $renderedContent = wiki_convert_links($html, argv(0) . '/' . argv(1) . '/' . $wikiUrlName); + $html = Zlib\NativeWikiPage::generate_toc(zidify_text(purify_html(Markdown(Zlib\NativeWikiPage::bbcode(json_decode($content)))))); + $renderedContent = Zlib\NativeWikiPage::convert_links($html, argv(0) . '/' . argv(1) . '/' . $wikiUrlName); } $showPageControls = $wiki_editor; break; @@ -296,7 +295,7 @@ class Wiki extends \Zotlabs\Web\Controller { } function post() { - require_once('include/wiki.php'); + require_once('include/bbcode.php'); $nick = argv(1); |