[phpwiki-checkins] SF.net SVN: phpwiki:[6372] trunk/lib/loadsave.php

[<ru...@us...>]

Revision: 6372
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6372&view=rev
Author:   rurban
Date:     2009-01-07 08:54:19 +0000 (Wed, 07 Jan 2009)

Log Message:
-----------
Support include=empty for backups to overwrite with deleted pages

Modified Paths:
--------------
    trunk/lib/loadsave.php

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2009-01-06 20:07:13 UTC (rev 6371)
+++ trunk/lib/loadsave.php	2009-01-07 08:54:19 UTC (rev 6372)
@@ -225,8 +225,11 @@
         $zipname         = WIKI_NAME . _("LatestSnapshot") . date('Ymd-Hi') . '.zip';
         $include_archive = false;
     }
+    $include_empty = false;
+    if ($request->getArg('include') == 'empty') {
+	$include_empty = true;
+    }
 
-
     $zip = new ZipWriter("Created by PhpWiki " . PHPWIKI_VERSION, $zipname);
 
     /* ignore fatals in plugins */
@@ -316,12 +319,16 @@
     } else {
         $excludeList = array();
     }
+    $include_empty = false;
+    if ($request->getArg('include') == 'empty') {
+	$include_empty = true;
+    }
     if ($pages = $request->getArg('pages')) {  // which pagenames
         if ($pages == '[]') // current page
             $pages = $thispage;
         $page_iter = new WikiDB_Array_PageIterator(explodePageList($pages));
     } else {
-        $page_iter = $dbi->getAllPages(false,false,false,$excludeList);
+        $page_iter = $dbi->getAllPages($include_empty,false,false,$excludeList);
     }
 
     $request_args = $request->args;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.