cvs: phd / build.php package.xml /themes/php bightml.php chunkedhtml.php phpweb.php

bjori Mon Nov 5 19:49:04 2007 UTC Modified files: /phd build.php package.xml /phd/themes/php bightml.php chunkedhtml.php phpweb.php Log: Fixed bug#43191 (build.php fails to included necessary theme dependencies). (Edward Z. Yang, Richard Q) http://cvs.php.net/viewvc.cgi/phd/build.php?r1=1.36&r2=1.37&diff_format=u Index: phd/build.php diff -u phd/build.php:1.36 phd/build.php:1.37 --- phd/build.php:1.36 Sun Oct 21 17:08:44 2007 +++ phd/build.php Mon Nov 5 19:49:04 2007 @@ -1,6 +1,6 @@ #!@php_bin@ <?php -/* $Id: build.php,v 1.36 2007/10/21 17:08:44 bjori Exp $ */ +/* $Id: build.php,v 1.37 2007/11/05 19:49:04 bjori Exp $ */ function err($no, $str, $file, $line) { global $notify; @@ -83,16 +83,9 @@ v("Using the %s theme (%s)\n", $theme, join(", ", $array)); } - /* Maybe other themes will need additional includes? */ - switch($theme) { - case "php": - require $ROOT ."/themes/php/phpdotnet.php"; - break; - } - foreach($array as $themename) { $themename = basename($themename); - require $ROOT. "/themes/$theme/$themename.php"; + require_once $ROOT. "/themes/$theme/$themename.php"; switch($theme) { case "php": $themes[$themename] = new $themename($IDs, http://cvs.php.net/viewvc.cgi/phd/package.xml?r1=1.11&r2=1.12&diff_format=u Index: phd/package.xml diff -u phd/package.xml:1.11 phd/package.xml:1.12 --- phd/package.xml:1.11 Sat Nov 3 17:14:45 2007 +++ phd/package.xml Mon Nov 5 19:49:04 2007 @@ -29,6 +29,8 @@ - Added getopt() parsing for few configuration options - Added support for errorcode, symbol and superscript elements (used by few translations) - Suppressed the contrib element + + - Fixed bug#43191 (build.php fails to included necessary theme dependencies). (Edward Z. Yang, Richard Q) </notes> <contents> <dir baseinstalldir="phd" name="/"> http://cvs.php.net/viewvc.cgi/phd/themes/php/bightml.php?r1=1.4&r2=1.5&diff_format=u Index: phd/themes/php/bightml.php diff -u phd/themes/php/bightml.php:1.4 phd/themes/php/bightml.php:1.5 --- phd/themes/php/bightml.php:1.4 Sun Sep 30 15:23:40 2007 +++ phd/themes/php/bightml.php Mon Nov 5 19:49:04 2007 @@ -1,6 +1,7 @@ <?php -/* $Id: bightml.php,v 1.4 2007/09/30 15:23:40 bjori Exp $ */ +/* $Id: bightml.php,v 1.5 2007/11/05 19:49:04 bjori Exp $ */ +require_once $ROOT . '/themes/php/phpdotnet.php'; class bightml extends phpdotnet implements PhDTheme { public function __construct(array $IDs, $filename, $ext = "html") { parent::__construct($IDs, $filename, $ext, false); http://cvs.php.net/viewvc.cgi/phd/themes/php/chunkedhtml.php?r1=1.6&r2=1.7&diff_format=u Index: phd/themes/php/chunkedhtml.php diff -u phd/themes/php/chunkedhtml.php:1.6 phd/themes/php/chunkedhtml.php:1.7 --- phd/themes/php/chunkedhtml.php:1.6 Sun Oct 21 11:42:33 2007 +++ phd/themes/php/chunkedhtml.php Mon Nov 5 19:49:04 2007 @@ -1,4 +1,7 @@ <?php +/* $Id: chunkedhtml.php,v 1.7 2007/11/05 19:49:04 bjori Exp $ */ + +require_once $ROOT . '/themes/php/phpweb.php'; class chunkedhtml extends phpweb { private $nav = ""; http://cvs.php.net/viewvc.cgi/phd/themes/php/phpweb.php?r1=1.17&r2=1.18&diff_format=u Index: phd/themes/php/phpweb.php diff -u phd/themes/php/phpweb.php:1.17 phd/themes/php/phpweb.php:1.18 --- phd/themes/php/phpweb.php:1.17 Sun Oct 21 17:08:44 2007 +++ phd/themes/php/phpweb.php Mon Nov 5 19:49:04 2007 @@ -1,6 +1,7 @@ <?php -/* $Id: phpweb.php,v 1.17 2007/10/21 17:08:44 bjori Exp $ */ +/* $Id: phpweb.php,v 1.18 2007/11/05 19:49:04 bjori Exp $ */ +require_once $ROOT . '/themes/php/phpdotnet.php'; class phpweb extends phpdotnet implements PhDTheme { protected $streams = array(); protected $writeit = false;