diff options
| author | zotlabs <mike@macgirvin.com> | 2017-06-06 17:39:43 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-06-06 17:39:43 -0700 |
| commit | 40b9130c63fbcc5bfd4ba5feb5463000dfe99d43 (patch) | |
| tree | 21585ce9f10d9a2eeef5d8f253bc362cad8a99a8 /Zotlabs/Module/Wiki.php | |
| parent | f3061651d448fed44dcd628d2d4a2ad4e63a70f4 (diff) | |
| parent | 4784f847c9d752c34ff4eeec8a6c40455fe313ce (diff) | |
| download | volse-hubzilla-40b9130c63fbcc5bfd4ba5feb5463000dfe99d43.tar.gz volse-hubzilla-40b9130c63fbcc5bfd4ba5feb5463000dfe99d43.tar.bz2 volse-hubzilla-40b9130c63fbcc5bfd4ba5feb5463000dfe99d43.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Module/Wiki.php')
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index f3b34401d..2f1fa01b7 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -207,9 +207,10 @@ class Wiki extends \Zotlabs\Web\Controller { $ignore_language = true; continue; } - if($page_name) + if($page_name) { $page_name .= '/'; - $page_name .= argv($x); + } + $page_name .= argv($x); } $pageUrlName = urldecode($page_name); @@ -296,7 +297,8 @@ class Wiki extends \Zotlabs\Web\Controller { '$showPageControls' => $showPageControls, '$editOrSourceLabel' => (($showPageControls) ? t('Edit') : t('Source')), '$tools_label' => 'Page Tools', - '$channel' => $owner['channel_address'], + '$channel_address' => $owner['channel_address'], + '$channel_id' => $owner['channel_id'], '$resource_id' => $resource_id, '$page' => $pageUrlName, '$mimeType' => $mimeType, @@ -495,10 +497,12 @@ class Wiki extends \Zotlabs\Web\Controller { $x = new \Zotlabs\Widget\Wiki_pages(); - $page_list_html = $x->widget(array( - 'resource_id' => $resource_id, - 'refresh' => true, - 'channel' => argv(1))); + $page_list_html = $x->widget([ + 'resource_id' => $resource_id, + 'channel_id' => $owner['channel_id'], + 'channel_address' => $owner['channel_address'], + 'refresh' => true + ]); json_return_and_die(array('pages' => $page_list_html, 'message' => '', 'success' => true)); } |