aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/diff/diff.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-11-17 19:37:57 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-11-17 19:37:57 +0000
commitd9387842ac7c41d4c92ccf7d797fed214ed38de8 (patch)
tree265e2c90946fd8c8dd95bcde2d5358343ff648f6 /phpBB/includes/diff/diff.php
parent17f00978ddef4dfdeb7a69ec4498a9a891354cf6 (diff)
downloadforums-d9387842ac7c41d4c92ccf7d797fed214ed38de8.tar
forums-d9387842ac7c41d4c92ccf7d797fed214ed38de8.tar.gz
forums-d9387842ac7c41d4c92ccf7d797fed214ed38de8.tar.bz2
forums-d9387842ac7c41d4c92ccf7d797fed214ed38de8.tar.xz
forums-d9387842ac7c41d4c92ccf7d797fed214ed38de8.zip
adjust some comments to work with phpdocumentor. :)
git-svn-id: file:///svn/phpbb/trunk@6595 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/diff/diff.php')
-rw-r--r--phpBB/includes/diff/diff.php11
1 files changed, 3 insertions, 8 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)