diff options
| author | Hubzilla <hubzilla@hz.macgirvin.com> | 2017-01-19 15:40:28 -0800 |
|---|---|---|
| committer | Hubzilla <hubzilla@hz.macgirvin.com> | 2017-01-19 15:40:28 -0800 |
| commit | f57926d9ece52df0208695bdf48b918444448ed1 (patch) | |
| tree | 5670aa2c00711ca0fa7c9693841675ad7f803faf | |
| parent | 96f196febda488e1db2d9a677fd5eb736aa76ae6 (diff) | |
| parent | 4295b1945e08b7e93286b4e51c3ba26a3828f80b (diff) | |
| download | volse-hubzilla-f57926d9ece52df0208695bdf48b918444448ed1.tar.gz volse-hubzilla-f57926d9ece52df0208695bdf48b918444448ed1.tar.bz2 volse-hubzilla-f57926d9ece52df0208695bdf48b918444448ed1.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
| -rw-r--r-- | Zotlabs/Lib/NativeWiki.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Lib/NativeWiki.php b/Zotlabs/Lib/NativeWiki.php index 8932040b0..31a893133 100644 --- a/Zotlabs/Lib/NativeWiki.php +++ b/Zotlabs/Lib/NativeWiki.php @@ -196,4 +196,4 @@ class NativeWiki { return array('read' => true, 'write' => $write, 'success' => true); } } -}
\ No newline at end of file +} diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 9adcc91b0..20a5eb35f 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -313,7 +313,7 @@ class Wiki extends \Zotlabs\Web\Controller { if((argc() > 2) && (argv(2) === 'preview')) { $content = $_POST['content']; $resource_id = $_POST['resource_id']; - $w = Zlib\NativeWiki::get_wiki($owner,$observer_hash,$resource_id); + $w = Zlib\NativeWiki::get_wiki($owner['channel_id'],$observer_hash,$resource_id); $wikiURL = argv(0) . '/' . argv(1) . '/' . $w['urlName']; |