Author: Kris.Wallsmith
Date: 2010-04-06 06:49:08 +0200 (Tue, 06 Apr 2010)
New Revision: 28988
Modified:
branches/1.3/lib/task/project/upgrade1.3/sfYamlUpgrade.class.php
Log:
[1.3] fixed upgrade of yaml booleans followed by inline comments (closes #8342)
Modified: branches/1.3/lib/task/project/upgrade1.3/sfYamlUpgrade.class.php
===================================================================
--- branches/1.3/lib/task/project/upgrade1.3/sfYamlUpgrade.class.php
2010-04-05 19:26:14 UTC (rev 28987)
+++ branches/1.3/lib/task/project/upgrade1.3/sfYamlUpgrade.class.php
2010-04-06 04:49:08 UTC (rev 28988)
@@ -31,8 +31,8 @@
// attempt to upgrade booleans
$original = file_get_contents($file);
$upgraded = sfToolkit::pregtr($original, array(
- '/^([^:]+: +)(?:on|y(?:es)?|\+)(\s*)$/im' => '\\1true\\2',
- '/^([^:]+: +)(?:off|no?|-)(\s*)$/im' => '\\1false\\2',
+ '/^([^:]+: +)(?:on|y(?:es)?|\+)(\s*(#.*)?)$/im' => '\\1true\\2',
+ '/^([^:]+: +)(?:off|no?|-)(\s*(#.*)?)$/im' => '\\1false\\2',
));
try
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
