aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-05-28 07:42:18 -0400
committerAndrew Manning <tamanning@zoho.com>2016-05-28 07:42:18 -0400
commitae94e8a855d31125b96e158c0fb8c0d6f22631d6 (patch)
tree0bb82a3d3c885356dae690fc991b17a758fc96e6 /Zotlabs
parentf884fa66782544cd6fc44a81b978a905d4755cea (diff)
downloadvolse-hubzilla-ae94e8a855d31125b96e158c0fb8c0d6f22631d6.tar.gz
volse-hubzilla-ae94e8a855d31125b96e158c0fb8c0d6f22631d6.tar.bz2
volse-hubzilla-ae94e8a855d31125b96e158c0fb8c0d6f22631d6.zip
Wiki page list links work. File content is not yet loaded into the editor. Removed some logger calls.
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Wiki.php10
1 files changed, 4 insertions, 6 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 9d905f561..54511fc91 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -55,7 +55,6 @@ class Wiki extends \Zotlabs\Web\Controller {
// Check if wiki exists andr redirect if it does not
$channel = get_channel_by_nick(argv(1));
$w = wiki_exists_by_name($channel['channel_id'], argv(2));
- logger('wiki_Exists: ' . json_encode($w));
if(!$w['id']) {
goaway('/'.argv(0).'/'.argv(1));
} else {
@@ -95,8 +94,6 @@ class Wiki extends \Zotlabs\Web\Controller {
// Render mardown-formatted text in HTML
if((argc() > 2) && (argv(2) === 'preview')) {
$content = $_POST['content'];
- logger('preview content: ' . $content);
- //require_once('library/parsedown/Parsedown.php');
$parsedown = new Parsedown();
$html = $parsedown->text($content);
json_return_and_die(array('html' => $html, 'success' => true));
@@ -133,9 +130,7 @@ class Wiki extends \Zotlabs\Web\Controller {
}
// Get ACL for permissions
$acl = new \Zotlabs\Access\AccessList($channel);
- logger('POST: ' . json_encode($_POST));
$acl->set_from_array($_POST);
- logger('acl: ' . json_encode($acl));
$r = wiki_create_wiki($channel, $observer_hash, $name, $acl);
if ($r['success']) {
goaway('/wiki/'.$which.'/'.$name);
@@ -220,7 +215,10 @@ class Wiki extends \Zotlabs\Web\Controller {
logger('Wiki read permission denied.' . EOL);
json_return_and_die(array('pages' => null, 'message' => 'Permission denied.', 'success' => false));
}
- $page_list_html = widget_wiki_pages(array('resource_id' => $resource_id));
+ $page_list_html = widget_wiki_pages(array(
+ 'resource_id' => $resource_id,
+ 'refresh' => true,
+ 'channel' => argv(1)));
json_return_and_die(array('pages' => $page_list_html, 'message' => '', 'success' => true));
}