diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 12:44:10 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 12:44:10 +0200 |
| commit | 28224bad70fe5c2d912d96f2f35e4e5d99301c71 (patch) | |
| tree | f022b99cff7c80074c4f2e82d40e273b56f0a973 /phpBB/includes/diff | |
| parent | f8046cc2533f9f87eb914564c4e0e1215b0f007f (diff) | |
| parent | 2f44a865a01d1c9d1198484c7a9e841c22ef267d (diff) | |
| download | forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.gz forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.bz2 forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.xz forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12557] Fix load active module description
[ticket/12557] Fix php file description
[ticket/12557] Fix post data description for notifications
[ticket/12557] Fix pass by reference doc blocks
[ticket/12557] Fix doc block in extension base class
[ticket/12557] Fix doc block in mimetype guesser
[ticket/12557] Fix var $preserve_cr description
[ticket/12557] Fix doc block errors found by Sami
[ticket/12557] Fix doc block errors found by Sami
[ticket/12557] Fix doc block errors found by Sami
[ticket/12557] Template fixes
[ticket/12557] Search, cron and profilefields fixes
[ticket/12557] Notification fixes
[ticket/12557] Fix doc block errors found by Sami pt1
[ticket/12557] Fix doc block errors found by Sami
[ticket/12557] Fix doc block errors found by Sami
Diffstat (limited to 'phpBB/includes/diff')
| -rw-r--r-- | phpBB/includes/diff/diff.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php index dd0fbcee02..d307880c4b 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_content An array of strings. Typically these are lines from a file. + * @param array &$to_content 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,11 @@ 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\n and bare \r are replaced by a new line + * in the diff output */ function diff3(&$orig, &$final1, &$final2, $preserve_cr = true) { |