makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12557] Fix var $preserve_cr description

Browse source 
PHPBB3-12557
This commit is contained in:
n-aleha 2014-05-28 20:40:44 +03:00
parent 95ec9590df
commit 6d7689f581
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/includes/diff/diff.php
View file

@ -495,7 +495,8 @@ class diff3 extends diff
* @param array $orig The original lines to use. * @param array $orig The original lines to use.
* @param array $final1 The first version to compare to. * @param array $final1 The first version to compare to.
* @param array $final2 The second 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) function diff3(&$orig, &$final1, &$final2, $preserve_cr = true)
{ {