harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

Browse Source
This commit is contained in:
Hubzilla 2017-01-19 15:40:28 -08:00
commit f57926d9ec
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Lib/NativeWiki.php
View File

@ -196,4 +196,4 @@ class NativeWiki {
return array('read' => true, 'write' => $write, 'success' => true); return array('read' => true, 'write' => $write, 'success' => true);
} }
} }
} }

2
Zotlabs/Module/Wiki.php
View File

@ -313,7 +313,7 @@ class Wiki extends \Zotlabs\Web\Controller {
if((argc() > 2) && (argv(2) === 'preview')) { if((argc() > 2) && (argv(2) === 'preview')) {
$content = $_POST['content']; $content = $_POST['content'];
$resource_id = $_POST['resource_id']; $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']; $wikiURL = argv(0) . '/' . argv(1) . '/' . $w['urlName'];