diff options
| author | Daniel Hunsaker <danhunsaker@gmail.com> | 2013-02-22 21:49:33 +0100 |
|---|---|---|
| committer | Daniel Hunsaker <danhunsaker@gmail.com> | 2013-02-22 21:49:33 +0100 |
| commit | 44a6d1da2be916fe0f23a3ea4d5fcb391d7f65dd (patch) | |
| tree | 31549ebf6ea5ea98e4347eb640d1caa685316f3e /system/core/Input.php | |
| parent | 353f9834adf3f44c6c7a0f924089bb2b43360404 (diff) | |
| parent | eb291c1d1e1116a4420fa30e587adeea0451eeb7 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/exit-status
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 8f37e4464..904f4d6e9 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; |