svn: /phd/trunk/phpdotnet/phd/ Config.php
| From: | Richard Quadling | Date: | Wed, 09 Feb 2011 11:16:44 +0000 |
| Subject: | svn: /phd/trunk/phpdotnet/phd/ Config.php | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-7719@lists.php.net to get a copy of this message | ||
rquadling Wed, 09 Feb 2011 11:16:44 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=308157
Log:
Using saveconfig once no longer saves the config on every call to render. Error introduced in commit
307980.
Changed paths:
U phd/trunk/phpdotnet/phd/Config.php
Modified: phd/trunk/phpdotnet/phd/Config.php
===================================================================
--- phd/trunk/phpdotnet/phd/Config.php 2011-02-09 08:30:37 UTC (rev 308156)
+++ phd/trunk/phpdotnet/phd/Config.php 2011-02-09 11:16:44 UTC (rev 308157)
@@ -60,7 +60,8 @@
if ($newInit = is_null(self::$optionArray)) {
// By default, Windows does not support colors on the console.
- // ANSICON by Jason Hood can be used to provide colors at the console.
+ // ANSICON by Jason Hood (http://adoxa.110mb.com/ansicon/index.html)
+ // can be used to provide colors at the console on Windows.
// Color output can still be enabled via the command line parameters --color
if('WIN' === strtoupper(substr(PHP_OS, 0, 3))) {
self::$optionArrayDefault['color_output'] = false;
@@ -76,7 +77,7 @@
self::$optionArray['package_dirs'][] = $dir;
}
}
-
+
// now merge other options
self::$optionArray = array_merge(self::$optionArray, (array)$a);
@@ -84,7 +85,7 @@
// a save configuration. This allows additional options to be added at the
// command line without them being automatically saved.
if ($newInit) {
- self::$optionArrayDefault['saveconfig'] = false;
+ self::$optionArray['saveconfig'] = false;
}
}
@@ -155,7 +156,7 @@
public static function setColor_output($color_output)
{
- // Disable colored output if the terminal doesn't support colours
+ // Disable colored output if the terminal doesn't support colors
if ($color_output && function_exists('posix_isatty')) {
if (!posix_isatty(Config::phd_info_output())) {
Config::setPhd_info_color(false);