[phpwiki-checkins] CVS: phpwiki/lib loadsave.php,1.156,1.157

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

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25090

Modified Files:
	loadsave.php 
Log Message:
better pageset detection: format=

Index: loadsave.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/loadsave.php,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -2 -b -p -d -r1.156 -r1.157
--- loadsave.php	15 Sep 2007 12:32:50 -0000	1.156
+++ loadsave.php	19 Sep 2007 18:01:27 -0000	1.157
@@ -511,6 +511,6 @@ function _DumpHtmlToDir ($target, $page_
         $excludeList = array('DebugAuthInfo', 'DebugGroupInfo', 'AuthInfo');
     }
-    if ($request->getArg('pages') or isa($page_iter, "WikiDB_Array_generic_iter")) { // pagelist
 	$WikiTheme->VALID_LINKS = array();
+    if ($request->getArg('format')) { // pagelist
 	$page_iter_sav = $page_iter;
 	foreach ($page_iter_sav->asArray() as $handle) {
@@ -551,5 +551,5 @@ function _DumpHtmlToDir ($target, $page_
 
     $request_args = $request->args;
-    $timeout = (! $request->getArg('start_debug')) ? 20 : 240;
+    $timeout = (! $request->getArg('start_debug')) ? 60 : 240;
     $SAVE_RCS_IDS = $GLOBALS['RCS_IDS'];
     if ($directory) {
@@ -636,4 +636,7 @@ function _DumpHtmlToDir ($target, $page_
 	    	$base = basename($img_file);
 	    	$data = str_replace('src="'.$img_file.'"','src="images/'.$base.'"', $data);
+	        if (array_key_exists($img_file, $already_images))
+	            continue;
+	        $already_images[$img_file] = 1;
 		// resolve src from webdata to file
 		$src = $doc_root . $img_file;
@@ -1566,4 +1569,7 @@ function LoadPostFile (&$request)
 /**
  $Log$
+ Revision 1.157  2007/09/19 18:01:27  rurban
+ better pageset detection: format=
+
  Revision 1.156  2007/09/15 12:32:50  rurban
  Improve multi-page format handling: abstract _DumpHtmlToDir. get rid of non-external pdf, non-global VALID_LINKS