mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-29 04:50:51 +02:00
Code Issues Releases Wiki Activity

[ticket/12557] Fix doc block errors found by Sami

Browse Source 
PHPBB3-12557
This commit is contained in:
n-aleha
2014-05-17 03:43:34 +03:00
parent c991b1d587
commit 19b9df7e63
6 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/diff/diff.php
View File

@@ -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)
{