aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-06-29 20:59:00 -0700
committerredmatrix <git@macgirvin.com>2016-06-29 20:59:00 -0700
commit9ef710c557fcc4ea01c87e03fd7a477eb037f09c (patch)
treeca181b89bb548fc4badbf2045c6320593f87e59f /Zotlabs
parentdf4ff26845ea2868998c6a05397dc8e3aa07ba98 (diff)
downloadvolse-hubzilla-9ef710c557fcc4ea01c87e03fd7a477eb037f09c.tar.gz
volse-hubzilla-9ef710c557fcc4ea01c87e03fd7a477eb037f09c.tar.bz2
volse-hubzilla-9ef710c557fcc4ea01c87e03fd7a477eb037f09c.zip
provide wiki as a feature (default is on so there aren't any surprises) and add to channel menu and profile tabs
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Wiki.php15
1 files changed, 15 insertions, 0 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 38b49effc..2f22f0a81 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -25,8 +25,18 @@ class Wiki extends \Zotlabs\Web\Controller {
}
function get() {
+
+ if(observer_prohibited(true)) {
+ return login();
+ }
+
+ $tab = 'wiki';
+
+
require_once('include/wiki.php');
require_once('include/acl_selectors.php');
+ require_once('include/conversation.php');
+
// TODO: Combine the interface configuration into a unified object
// Something like $interface = array('new_page_button' => false, 'new_wiki_button' => false, ...)
$wiki_owner = false;
@@ -151,6 +161,11 @@ class Wiki extends \Zotlabs\Web\Controller {
)
);
+ $is_owner = ((local_channel()) && (local_channel() == \App::$profile['profile_uid']) ? true : false);
+
+ $o .= profile_tabs($a, $is_owner, \App::$profile['channel_address']);
+
+
$o .= replace_macros(get_markup_template('wiki.tpl'),array(
'$wikiheaderName' => $wikiheaderName,
'$wikiheaderPage' => $wikiheaderPage,