diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-19 13:09:19 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-19 13:09:19 -0700 |
| commit | 51e40add661219c26c73f4b8d6da1f691e0b9b6d (patch) | |
| tree | 6ce7fcce4ead9110c67eecd08be652b07350ccb5 /Zotlabs/Module/Wiki.php | |
| parent | 8123a62302330cc8629d0c8ecb68d3d3be07a005 (diff) | |
| parent | 4500faf463e7fd6fcf9948666421c941a1292df9 (diff) | |
| download | volse-hubzilla-51e40add661219c26c73f4b8d6da1f691e0b9b6d.tar.gz volse-hubzilla-51e40add661219c26c73f4b8d6da1f691e0b9b6d.tar.bz2 volse-hubzilla-51e40add661219c26c73f4b8d6da1f691e0b9b6d.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 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 6055b0b38..2668229ee 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -140,11 +140,16 @@ class Wiki extends \Zotlabs\Web\Controller { $zip = new \ZipArchive; $r = $zip->open($zip_filepath, \ZipArchive::CREATE); if($r === true) { - $i = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s'", + $pages = []; + $i = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' order by revision desc", dbesc($resource_id) ); + if($i) { foreach($i as $iv) { + if(in_array($iv['mid'],$pages)) + continue; + if($iv['mimetype'] === 'text/plain') { $content = html_entity_decode($iv['body'],ENT_COMPAT,'UTF-8'); } @@ -156,6 +161,7 @@ class Wiki extends \Zotlabs\Web\Controller { } $fname = get_iconfig($iv['id'],'nwikipage','pagetitle') . Zlib\NativeWikiPage::get_file_ext($iv); $zip->addFromString($fname,$content); + $pages[] = $iv['mid']; } |