diff options
| author | Andrey Andreev <narf@bofh.bg> | 2013-01-28 10:01:26 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2013-01-28 10:01:26 +0100 |
| commit | 041de072875a6c2a93e2e6c180921d5b8ac6f1f9 (patch) | |
| tree | 13f6a219f2593df79821ad26a539881b70943554 /system/core/Input.php | |
| parent | db529ca1e13e9f9e1c73be20c3b92a7adc3c6aa2 (diff) | |
| parent | 3385d9c20ca1fe130a238fbe797f537155622e84 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core/Input.php')
| -rw-r--r-- | system/core/Input.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Input.php b/system/core/Input.php index 82e22dd49..68a8fe03f 100644 --- a/system/core/Input.php +++ b/system/core/Input.php @@ -720,9 +720,9 @@ class CI_Input { } // Standardize newlines if needed - if ($this->_standardize_newlines === TRUE && strpos($str, "\r") !== FALSE) + if ($this->_standardize_newlines === TRUE) { - return str_replace(array("\r\n", "\r", "\r\n\n"), PHP_EOL, $str); + return preg_replace('/(?:\r\n|[\r\n])/', PHP_EOL, $str); } return $str; |