diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:34 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:34 +0100 |
| commit | 89b37954f994a7cd517553d2d16686f91dcaae72 (patch) | |
| tree | b20e25768bc55be250454c439ffee08ce2981031 /phpBB/includes/diff | |
| parent | 07633a66e8c9bbb2b288a286bfbea6f562eeca4d (diff) | |
| parent | 80d429a02d26da1f00777e62a0268d83f581f598 (diff) | |
| download | forums-89b37954f994a7cd517553d2d16686f91dcaae72.tar forums-89b37954f994a7cd517553d2d16686f91dcaae72.tar.gz forums-89b37954f994a7cd517553d2d16686f91dcaae72.tar.bz2 forums-89b37954f994a7cd517553d2d16686f91dcaae72.tar.xz forums-89b37954f994a7cd517553d2d16686f91dcaae72.zip | |
Merge commit 'release-3.0-B4'
Diffstat (limited to 'phpBB/includes/diff')
| -rw-r--r-- | phpBB/includes/diff/diff.php | 11 | ||||
| -rw-r--r-- | phpBB/includes/diff/engine.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/diff/renderer.php | 8 |
3 files changed, 8 insertions, 17 deletions
diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php index fd2d557a19..ca8d16fd3e 100644 --- a/phpBB/includes/diff/diff.php +++ b/phpBB/includes/diff/diff.php @@ -23,17 +23,12 @@ include_once($phpbb_root_path . 'includes/diff/renderer.' . $phpEx); * Code from pear.php.net, Text_Diff-0.2.1 (beta) package * http://pear.php.net/package/Text_Diff/ * -* Modified by Acyd Burn to meet our coding standards +* Modified by phpBB Group to meet our coding standards * and being able to integrate into phpBB -*/ - -/** +* * General API for generating and formatting diffs - the differences between * two sequences of strings. * -* The PHP diff code used in this package was originally written by Geoffrey -* T. Dairiki and is used with his permission. -* * @package phpBB3 * @author Geoffrey T. Dairiki <dairiki@dairiki.org> */ @@ -182,7 +177,7 @@ class diff /** * Removes trailing newlines from a line of text. This is meant to be used with array_walk(). * - * @param string $line The line to trim. + * @param string &$line The line to trim. * @param integer $key The index of the line in the array. Not used. */ function trim_newlines(&$line, $key) diff --git a/phpBB/includes/diff/engine.php b/phpBB/includes/diff/engine.php index c230d865cd..5fcb317dd5 100644 --- a/phpBB/includes/diff/engine.php +++ b/phpBB/includes/diff/engine.php @@ -19,11 +19,9 @@ if (!defined('IN_PHPBB')) * Code from pear.php.net, Text_Diff-0.2.1 (beta) package * http://pear.php.net/package/Text_Diff/ * -* Modified by Acyd Burn to meet our coding standards +* Modified by phpBB Group to meet our coding standards * and being able to integrate into phpBB -*/ - -/** +* * Class used internally by Diff to actually compute the diffs. This class is * implemented using native PHP code. * diff --git a/phpBB/includes/diff/renderer.php b/phpBB/includes/diff/renderer.php index 408addb858..984fd65708 100644 --- a/phpBB/includes/diff/renderer.php +++ b/phpBB/includes/diff/renderer.php @@ -19,11 +19,9 @@ if (!defined('IN_PHPBB')) * Code from pear.php.net, Text_Diff-0.2.1 (beta) package * http://pear.php.net/package/Text_Diff/ * -* Modified by Acyd Burn to meet our coding standards +* Modified by phpBB Group to meet our coding standards * and being able to integrate into phpBB -*/ - -/** +* * A class to render Diffs in different formats. * * This class renders the diff in classic diff format. It is intended that @@ -86,7 +84,7 @@ class diff_renderer /** * Renders a diff. * - * @param diff $diff A diff object. + * @param diff &$diff A diff object. * * @return string The formatted output. */ |