diff options
| author | zotlabs <mike@macgirvin.com> | 2017-06-07 17:11:35 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-06-07 17:11:35 -0700 |
| commit | 9dbd99714186ac5ea008e8e17e12be5076e8553f (patch) | |
| tree | 3898c5422c9fb854d7ebe21084ec409ed45f2140 /Zotlabs/Module | |
| parent | 2e35dc648fd61ae2d39e8c46c14dbf19d31942fb (diff) | |
| parent | 55836e8ca65ca9a2ae25591de3232470d7a50049 (diff) | |
| download | volse-hubzilla-9dbd99714186ac5ea008e8e17e12be5076e8553f.tar.gz volse-hubzilla-9dbd99714186ac5ea008e8e17e12be5076e8553f.tar.bz2 volse-hubzilla-9dbd99714186ac5ea008e8e17e12be5076e8553f.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Randprof.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 18 |
2 files changed, 12 insertions, 8 deletions
diff --git a/Zotlabs/Module/Randprof.php b/Zotlabs/Module/Randprof.php index dc2e925fe..94ec095cb 100644 --- a/Zotlabs/Module/Randprof.php +++ b/Zotlabs/Module/Randprof.php @@ -8,7 +8,7 @@ class Randprof extends \Zotlabs\Web\Controller { function init() { $x = random_profile(); if($x) - goaway(chanlink_url($x)); + goaway(chanlink_hash($x)); /** FIXME this doesn't work at the moment as a fallback */ goaway(z_root() . '/profile'); diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 5a93046e3..85481754f 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, @@ -496,10 +498,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)); } |