diff options
| author | n-aleha <nick_aleha@myway.com> | 2014-05-28 20:40:44 +0300 |
|---|---|---|
| committer | n-aleha <nick_aleha@myway.com> | 2014-08-03 07:13:21 +0300 |
| commit | 6d7689f581da281587a999e82007dda283dd590b (patch) | |
| tree | fea706ceb6aeebe837c400e5821963619d474c21 /phpBB/includes/diff | |
| parent | 95ec9590dfd2e93a75383745f385aaa3493ed857 (diff) | |
| download | forums-6d7689f581da281587a999e82007dda283dd590b.tar forums-6d7689f581da281587a999e82007dda283dd590b.tar.gz forums-6d7689f581da281587a999e82007dda283dd590b.tar.bz2 forums-6d7689f581da281587a999e82007dda283dd590b.tar.xz forums-6d7689f581da281587a999e82007dda283dd590b.zip | |
[ticket/12557] Fix var $preserve_cr description
PHPBB3-12557
Diffstat (limited to 'phpBB/includes/diff')
| -rw-r--r-- | phpBB/includes/diff/diff.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php index 17fa726352..e16a549ef7 100644 --- a/phpBB/includes/diff/diff.php +++ b/phpBB/includes/diff/diff.php @@ -495,7 +495,8 @@ class diff3 extends diff * @param array $orig The original lines to use. * @param array $final1 The first version to compare to. * @param array $final2 The second version to compare to. - * @param bool $preserve_cr If true, \r is replaced by a new line in the diff output + * @param bool $preserve_cr If true, \r\n and bare \r are replaced by a new line + * in the diff output */ function diff3(&$orig, &$final1, &$final2, $preserve_cr = true) { |