From: Reini U. <ru...@us...> - 2008-02-14 18:36:49
|
Update of /cvsroot/phpwiki/phpwiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3351 Modified Files: loadsave.php Log Message: use addSrcFile Index: loadsave.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/loadsave.php,v retrieving revision 1.157 retrieving revision 1.158 diff -u -2 -b -p -d -r1.157 -r1.158 --- loadsave.php 19 Sep 2007 18:01:27 -0000 1.157 +++ loadsave.php 14 Feb 2008 18:36:52 -0000 1.158 @@ -569,5 +569,5 @@ function _DumpHtmlToDir ($target, $page_ $pagename = $page->getName(); } - if (!$firstpage) $firstpage = $pagename; + if (empty($firstpage)) $firstpage = $pagename; if (array_key_exists($pagename, $already)) continue; @@ -642,6 +642,6 @@ function _DumpHtmlToDir ($target, $page_ $src = $doc_root . $img_file; if (file_exists($src) and $base) { - $target = "$directory/images/$base"; if ($directory) { + $target = "$directory/images/$base"; if (copy($src, $target)) { if (!$silent) @@ -652,11 +652,6 @@ function _DumpHtmlToDir ($target, $page_ } } else { - if (!array_key_exists($img_file, $already_images)) { - $already_images[$img_file] = 1; - if (check_php_version(4,3)) - $zip->addRegularFile($target, file_get_contents($src), $attrib); - else - $zip->addRegularFile($target, join('', file($src)), $attrib); - } + $target = "images/$base"; + $zip->addSrcFile($target, $src); } } @@ -703,6 +698,8 @@ function _DumpHtmlToDir ($target, $page_ unset($current->_transformedContent); unset($current); + if (!empty($template)) { unset($template->_request); unset($template); + } unset($data); if (DEBUG) @@ -711,4 +708,5 @@ function _DumpHtmlToDir ($target, $page_ $page_iter->free(); + $attrib = false; //array('is_ascii' => 0); if (!empty($WikiTheme->dumped_images) and is_array($WikiTheme->dumped_images)) { // @mkdir("$directory/images"); @@ -734,8 +732,5 @@ function _DumpHtmlToDir ($target, $page_ } else { $target = "images/".basename($from); - if (check_php_version(4,3)) - $zip->addRegularFile($target, file_get_contents($WikiTheme->_path . $from), $attrib); - else - $zip->addRegularFile($target, join('', file($WikiTheme->_path . $from)), $attrib); + $zip->addSrcFile($target, $WikiTheme->_path . $from); } } elseif (!$silent) { @@ -772,8 +767,5 @@ function _DumpHtmlToDir ($target, $page_ } else { $target = "images/buttons/".basename($from); - if (check_php_version(4,3)) - $zip->addRegularFile($target, file_get_contents($WikiTheme->_path . $from), $attrib); - else - $zip->addRegularFile($target, join('', file($WikiTheme->_path . $from)), $attrib); + $zip->addSrcFile($target, $WikiTheme->_path . $from); } } elseif (!$silent) { @@ -804,9 +796,7 @@ function _DumpHtmlToDir ($target, $page_ } } else { + //$attrib = array('is_ascii' => 0); $target = basename($css_file); - if (check_php_version(4,3)) - $zip->addRegularFile($target, file_get_contents($WikiTheme->_path . $from), $attrib); - else - $zip->addRegularFile($target, join('', file($WikiTheme->_path . $from)), $attrib); + $zip->addSrcFile($target, $WikiTheme->_path . $from); } } elseif (!$silent) { @@ -1569,4 +1559,7 @@ function LoadPostFile (&$request) /** $Log$ + Revision 1.158 2008/02/14 18:36:52 rurban + use addSrcFile + Revision 1.157 2007/09/19 18:01:27 rurban better pageset detection: format= |