cvs: phd(PHD_0_2) / config.php /themes/php chmsource.php

From: Date: Sat, 05 Jul 2008 19:36:56 +0000
Subject: cvs: phd(PHD_0_2) / config.php /themes/php chmsource.php
Groups: php.doc.cvs 
Request: Send a blank email to doc-cvs+get-1837@lists.php.net to get a copy of this message
loudi Sat Jul 5 19:36:56 2008 UTC Modified files: (Branch: PHD_0_2) /phd config.php /phd/themes/php chmsource.php Log: CHM now works fine with 0_2 branch (with "-t chmsource" option or no option at all) http://cvs.php.net/viewvc.cgi/phd/config.php?r1=1.45.2.2&r2=1.45.2.3&diff_format=u Index: phd/config.php diff -u phd/config.php:1.45.2.2 phd/config.php:1.45.2.3 --- phd/config.php:1.45.2.2 Sat May 24 19:45:45 2008 +++ phd/config.php Sat Jul 5 19:36:56 2008 @@ -1,5 +1,5 @@ <?php -/* $Id: config.php,v 1.45.2.2 2008/05/24 19:45:45 gwynne Exp $ */ +/* $Id: config.php,v 1.45.2.3 2008/07/05 19:36:56 loudi Exp $ */ /* {{{ PhD error & message handler */ @@ -134,6 +134,7 @@ 'phpweb', 'chunkedhtml', 'bightml', + 'chmsource', ), ), ), @@ -304,6 +305,7 @@ echo "\tphpweb\n"; echo "\tchunkedhtml\n"; echo "\tbightml\n"; + echo "\tchmsource\n"; break; default: @@ -317,6 +319,7 @@ echo "\tphpweb\n"; echo "\tchunkedhtml\n"; echo "\tbightml\n"; + echo "\tchmsource\n"; break; } } @@ -371,6 +374,7 @@ case "phpweb": case "chunkedhtml": case "bightml": + case "chmsource": if (!in_array($val, $OPTIONS["output_theme"]["xhtml"]["php"])) { $OPTIONS["output_theme"]["xhtml"]["php"][] = $val; } http://cvs.php.net/viewvc.cgi/phd/themes/php/chmsource.php?r1=1.4.2.2&r2=1.4.2.3&diff_format=u Index: phd/themes/php/chmsource.php diff -u phd/themes/php/chmsource.php:1.4.2.2 phd/themes/php/chmsource.php:1.4.2.3 --- phd/themes/php/chmsource.php:1.4.2.2 Mon Jun 9 22:09:53 2008 +++ phd/themes/php/chmsource.php Sat Jul 5 19:36:56 2008 @@ -1,5 +1,5 @@ <?php -/* $Id: chmsource.php,v 1.4.2.2 2008/06/09 22:09:53 loudi Exp $ */ +/* $Id: chmsource.php,v 1.4.2.3 2008/07/05 19:36:56 loudi Exp $ */ require_once $ROOT . '/themes/php/chunkedhtml.php'; class chmsource extends chunkedhtml { @@ -184,14 +184,14 @@ public function __construct(array $IDs, $filename, $ext = "html", $dir = "chm") { chunkedhtml::__construct($IDs, $filename, $ext); - $this->chmdir = PhDConfig::output_dir() . $dir . DIRECTORY_SEPARATOR; + $this->chmdir = $GLOBALS['OPTIONS']['output_dir'] . $dir . DIRECTORY_SEPARATOR; if(!file_exists($this->chmdir) || is_file($this->chmdir)) mkdir($this->chmdir) or die("Can't create the CHM project directory"); - $this->outputdir = PhDConfig::output_dir() . $dir . DIRECTORY_SEPARATOR . "res" . DIRECTORY_SEPARATOR; + $this->outputdir = $GLOBALS['OPTIONS']['output_dir'] . $dir . DIRECTORY_SEPARATOR . "res" . DIRECTORY_SEPARATOR; if(!file_exists($this->outputdir) || is_file($this->outputdir)) mkdir($this->outputdir) or die("Can't create the cache directory"); - $lang = PhDConfig::language(); + $lang = $GLOBALS['OPTIONS']['language']; $this->hhpStream = fopen($this->chmdir . "php_manual_{$lang}.hhp", "w"); $this->hhcStream = fopen($this->chmdir . "php_manual_{$lang}.hhc", "w"); $this->hhkStream = fopen($this->chmdir . "php_manual_{$lang}.hhk", "w"); @@ -236,7 +236,7 @@ } protected function headerChm() { - $lang = PhDConfig::language(); + $lang = $GLOBALS['OPTIONS']['language']; fwrite($this->hhpStream, '[OPTIONS] Compatibility=1.1 or later Compiled file=php_manual_' . $lang . '.chm

« previous php.doc.cvs (#1837) next »