diff options
| author | n-aleha <nick_aleha@myway.com> | 2014-05-17 03:43:34 +0300 |
|---|---|---|
| committer | n-aleha <nick_aleha@myway.com> | 2014-08-03 06:57:05 +0300 |
| commit | 19b9df7e630031e3bdf0640a91f7025da3a00257 (patch) | |
| tree | 100803d4d1390fbddcd0c7f2c448237c586d9f09 /phpBB/includes/diff | |
| parent | c991b1d587e8ab3b080e2e6762646efe00e05bc5 (diff) | |
| download | forums-19b9df7e630031e3bdf0640a91f7025da3a00257.tar forums-19b9df7e630031e3bdf0640a91f7025da3a00257.tar.gz forums-19b9df7e630031e3bdf0640a91f7025da3a00257.tar.bz2 forums-19b9df7e630031e3bdf0640a91f7025da3a00257.tar.xz forums-19b9df7e630031e3bdf0640a91f7025da3a00257.zip | |
[ticket/12557] Fix doc block errors found by Sami
PHPBB3-12557
Diffstat (limited to 'phpBB/includes/diff')
| -rw-r--r-- | phpBB/includes/diff/diff.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php index dd0fbcee02..d4bd60c988 100644 --- a/phpBB/includes/diff/diff.php +++ b/phpBB/includes/diff/diff.php @@ -46,8 +46,9 @@ class diff /** * Computes diffs between sequences of strings. * - * @param array $from_lines An array of strings. Typically these are lines from a file. - * @param array $to_lines An array of strings. + * @param array $from_lines An array of strings. Typically these are lines from a file. + * @param array $to_lines An array of strings. + * @param bool $preserve_cr If true, \r is replaced by a new line in the diff output */ function diff(&$from_content, &$to_content, $preserve_cr = true) { @@ -491,9 +492,10 @@ class diff3 extends diff /** * Computes diff between 3 sequences of strings. * - * @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 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 */ function diff3(&$orig, &$final1, &$final2, $preserve_cr = true) { |