cvs: pear /Config/Config/Container IniCommented.php
| From: | Adam AShley | Date: | Tue, 03 Jan 2006 02:58:43 +0000 |
| Subject: | cvs: pear /Config/Config/Container IniCommented.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-37269@lists.php.net to get a copy of this message | ||
aashley Tue Jan 3 02:58:43 2006 UTC
Modified files:
/pear/Config/Config/Container IniCommented.php
Log:
Bug #6385. Add support for colons within keys in INI files read by the IniCommented container.
http://cvs.php.net/viewcvs.cgi/pear/Config/Config/Container/IniCommented.php?r1=1.21&r2=1.22&diff_format=u
Index: pear/Config/Config/Container/IniCommented.php
diff -u pear/Config/Config/Container/IniCommented.php:1.21
pear/Config/Config/Container/IniCommented.php:1.22
--- pear/Config/Config/Container/IniCommented.php:1.21 Sat Dec 24 02:24:30 2005
+++ pear/Config/Config/Container/IniCommented.php Tue Jan 3 02:58:43 2006
@@ -15,7 +15,7 @@
// | Author: Bertrand Mansion <bmansion@mamasam.com> |
// +----------------------------------------------------------------------+
//
-// $Id: IniCommented.php,v 1.21 2005/12/24 02:24:30 aashley Exp $
+// $Id: IniCommented.php,v 1.22 2006/01/03 02:58:43 aashley Exp $
/**
* Config parser for PHP .ini files with comments
@@ -70,7 +70,7 @@
} elseif (preg_match('/^\s*$/', $line)) {
// a blank line
$currentSection->createBlank();
- } elseif (preg_match('/^\s*([a-zA-Z0-9_\-\.\s]*)\s*=\s*(.*)\s*$/', $line,
$match)) {
+ } elseif (preg_match('/^\s*([a-zA-Z0-9_\-\.\s:]*)\s*=\s*(.*)\s*$/', $line,
$match)) {
// a directive
$values = $this->_quoteAndCommaParser($match[2]);