cvs: phd / package.xml /themes/php chunkedhtml.php

bjori Mon Nov 5 20:45:44 2007 UTC Modified files: /phd package.xml /phd/themes/php chunkedhtml.php Log: Fixed bug#43192 (Chunked HTML output difficult to use without TOC). (Edward Z. Yang) http://cvs.php.net/viewvc.cgi/phd/package.xml?r1=1.12&r2=1.13&diff_format=u Index: phd/package.xml diff -u phd/package.xml:1.12 phd/package.xml:1.13 --- phd/package.xml:1.12 Mon Nov 5 19:49:04 2007 +++ phd/package.xml Mon Nov 5 20:45:43 2007 @@ -30,6 +30,7 @@ - Added support for errorcode, symbol and superscript elements (used by few translations) - Suppressed the contrib element + - Fixed bug#43192 (Chunked HTML output difficult to use without TOC). (Edward Z. Yang) - Fixed bug#43191 (build.php fails to included necessary theme dependencies). (Edward Z. Yang, Richard Q) </notes> <contents> http://cvs.php.net/viewvc.cgi/phd/themes/php/chunkedhtml.php?r1=1.7&r2=1.8&diff_format=u Index: phd/themes/php/chunkedhtml.php diff -u phd/themes/php/chunkedhtml.php:1.7 phd/themes/php/chunkedhtml.php:1.8 --- phd/themes/php/chunkedhtml.php:1.7 Mon Nov 5 19:49:04 2007 +++ phd/themes/php/chunkedhtml.php Mon Nov 5 20:45:44 2007 @@ -1,5 +1,5 @@ <?php -/* $Id: chunkedhtml.php,v 1.7 2007/11/05 19:49:04 bjori Exp $ */ +/* $Id: chunkedhtml.php,v 1.8 2007/11/05 20:45:44 bjori Exp $ */ require_once $ROOT . '/themes/php/phpweb.php'; class chunkedhtml extends phpweb { @@ -8,6 +8,7 @@ public function __construct(array $IDs, $filename, $ext = "html") { phpdotnet::__construct($IDs, $filename, $ext, true); if(!file_exists("html") || is_file("html")) mkdir("html") or die("Can't create the cache directory"); + elseif (file_exists('html/index.html')) unlink('html/index.html'); // preserve back-compat } public function header($id) { $title = PhDHelper::getDescription($id, true); @@ -47,7 +48,7 @@ return "<hr />$nav</body></html>\n"; } public function __destruct() { - if (file_exists("html/manual.html")) { + if (file_exists("html/manual.html") && !file_exists('html/index.html')) { copy("html/manual.html", "html/index.html"); } }