svn: /phd/trunk/ phpdotnet/phd/Config.php render.php
| From: | Hannes Magnusson | Date: | Fri, 31 Jul 2009 20:09:47 +0000 |
| Subject: | svn: /phd/trunk/ phpdotnet/phd/Config.php render.php | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-4585@lists.php.net to get a copy of this message | ||
bjori Fri, 31 Jul 2009 20:09:47 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=286600
Log:
Set default values properly (looks like this was all just test code.. :))
Changed paths:
U phd/trunk/phpdotnet/phd/Config.php
U phd/trunk/render.php
Modified: phd/trunk/phpdotnet/phd/Config.php
===================================================================
--- phd/trunk/phpdotnet/phd/Config.php 2009-07-31 19:39:13 UTC (rev 286599)
+++ phd/trunk/phpdotnet/phd/Config.php 2009-07-31 20:09:47 UTC (rev 286600)
@@ -15,7 +15,9 @@
'index' => true,
'xml_root' => '.',
'xml_file' => "./.manual.xml",
- 'lang_dir' => './',
+ "lang_dir" => __DIR__ . DIRECTORY_SEPARATOR . "phpdotnet" .
DIRECTORY_SEPARATOR
+ . "phd" . DIRECTORY_SEPARATOR . "data" .
DIRECTORY_SEPARATOR
+ . "langs" . DIRECTORY_SEPARATOR,
'language' => 'en',
'verbose' => VERBOSE_DEFAULT,
'date_format' => "H:i:s",
@@ -26,11 +28,11 @@
'color_output' => true,
'output_dir' => './output/',
'intermediate_output_dir' => '.',
- 'php_error_output' => NULL,
+ 'php_error_output' => STDERR,
'php_error_color' => "01;31",
- 'user_error_output' => NULL,
+ 'user_error_output' => STDERR,
'user_error_color' => "01;33",
- 'phd_info_output' => NULL,
+ 'phd_info_output' => STDOUT,
'phd_info_color' => "01;32",
'highlighter' => "phpdotnet\\phd\\Highlighter",
"package" => array(
@@ -73,10 +75,6 @@
}
-Config::set_php_error_output(STDERR);
-Config::set_user_error_output(STDERR);
-Config::set_phd_info_output(STDOUT);
-
/* {{{ phd_bool($var) Returns boolean true/false on success, null on failure */
function phd_bool($val) {
if (!is_string($val)) {
Modified: phd/trunk/render.php
===================================================================
--- phd/trunk/render.php 2009-07-31 19:39:13 UTC (rev 286599)
+++ phd/trunk/render.php 2009-07-31 20:09:47 UTC (rev 286600)
@@ -31,13 +31,9 @@
}
Config::init(array(
- "verbose" =>
VERBOSE_ALL^(VERBOSE_PARTIAL_CHILD_READING|VERBOSE_CHUNK_WRITING),
- "lang_dir" => __DIR__ . DIRECTORY_SEPARATOR . "phpdotnet"
. DIRECTORY_SEPARATOR
- . "phd" . DIRECTORY_SEPARATOR . "data" .
DIRECTORY_SEPARATOR
- . "langs" . DIRECTORY_SEPARATOR,
"phpweb_version_filename" => Config::xml_root() . DIRECTORY_SEPARATOR .
'version.xml',
"phpweb_acronym_filename" => Config::xml_root() . DIRECTORY_SEPARATOR .
'entities' . DIRECTORY_SEPARATOR . 'acronyms.xml',
- ));
+));
$render = new Render();
$reader = new Reader();