Changeset 13391

Timestamp:

11/27/08 09:56:22 (7 months ago)

Author:

fabien

Message:

[1.1, 1.2] YAML dumper should remove carriage returns (\r) (closes #4740)

Files:

• branches/1.1/lib/yaml/sfYamlInline.class.php (modified) (1 diff)
• branches/1.2/lib/yaml/sfYamlInline.class.php (modified) (1 diff)

branches/1.1/lib/yaml/sfYamlInline.class.php

@@ -74 +74 @@
-        return is_infinite($value) ? str_ireplace('INF', '.Inf', strval($value)) : (is_string($value) ? "'$value'" : $value);
-      case false !== strpos($value, "\n"):
-), array('\\"', '\n
+, "\r"), array('\\"', '\n', '\r
-      case preg_match('/[ \s \' " \: \{ \} \[ \] , & \*]/x', $value):
-        return sprintf("'%s'", str_replace('\'', '\'\'', $value));

branches/1.2/lib/yaml/sfYamlInline.class.php

@@ -74 +74 @@
-        return is_infinite($value) ? str_ireplace('INF', '.Inf', strval($value)) : (is_string($value) ? "'$value'" : $value);
-      case false !== strpos($value, "\n"):
-), array('\\"', '\n
+, "\r"), array('\\"', '\n', '\r
-      case preg_match('/[ \s \' " \: \{ \} \[ \] , & \*]/x', $value):
-        return sprintf("'%s'", str_replace('\'', '\'\'', $value));