diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-01-12 16:47:58 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-01-12 16:47:58 +0000 |
| commit | 507d8b03851f6aa429766a6e0dd3b2926dc8e5e7 (patch) | |
| tree | 67264b67c14dba203d4aac6494af82607acb1b7c | |
| parent | 0b313ad33300342570e7d367fc4270301cb8c3ac (diff) | |
| download | forums-507d8b03851f6aa429766a6e0dd3b2926dc8e5e7.tar forums-507d8b03851f6aa429766a6e0dd3b2926dc8e5e7.tar.gz forums-507d8b03851f6aa429766a6e0dd3b2926dc8e5e7.tar.bz2 forums-507d8b03851f6aa429766a6e0dd3b2926dc8e5e7.tar.xz forums-507d8b03851f6aa429766a6e0dd3b2926dc8e5e7.zip | |
update diff engine to Text_Diff 1.1.0
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9251 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/diff/diff.php | 44 | ||||
| -rw-r--r-- | phpBB/includes/diff/engine.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/diff/renderer.php | 2 |
3 files changed, 45 insertions, 3 deletions
diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php index ef018b2d9a..bc99ebdd85 100644 --- a/phpBB/includes/diff/diff.php +++ b/phpBB/includes/diff/diff.php @@ -17,7 +17,7 @@ if (!defined('IN_PHPBB')) } /** -* Code from pear.php.net, Text_Diff-1.0.0 package +* Code from pear.php.net, Text_Diff-1.1.0 package * http://pear.php.net/package/Text_Diff/ * * Modified by phpBB Group to meet our coding standards @@ -61,6 +61,48 @@ class diff } /** + * returns the number of new (added) lines in a given diff. + * + * @since Text_Diff 1.1.0 + * + * @return integer The number of new lines + */ + function count_added_lines() + { + $count = 0; + + foreach ($this->_edits as $edit) + { + if (is_a($edit, 'diff_op_add') || is_a($edit, 'diff_op_change')) + { + $count += $edit->nfinal(); + } + } + return $count; + } + + /** + * Returns the number of deleted (removed) lines in a given diff. + * + * @since Text_Diff 1.1.0 + * + * @return integer The number of deleted lines + */ + function count_deleted_lines() + { + $count = 0; + + foreach ($this->_edits as $edit) + { + if (is_a($edit, 'diff_op_delete') || is_a($edit, 'diff_op_change')) + { + $count += $edit->norig(); + } + } + return $count; + } + + /** * Computes a reversed diff. * * Example: diff --git a/phpBB/includes/diff/engine.php b/phpBB/includes/diff/engine.php index d82afb048a..eb0dcce395 100644 --- a/phpBB/includes/diff/engine.php +++ b/phpBB/includes/diff/engine.php @@ -17,7 +17,7 @@ if (!defined('IN_PHPBB')) } /** -* Code from pear.php.net, Text_Diff-1.0.0 package +* Code from pear.php.net, Text_Diff-1.1.0 package * http://pear.php.net/package/Text_Diff/ (native engine) * * Modified by phpBB Group to meet our coding standards diff --git a/phpBB/includes/diff/renderer.php b/phpBB/includes/diff/renderer.php index 2e0ec86e75..02fb6ccc37 100644 --- a/phpBB/includes/diff/renderer.php +++ b/phpBB/includes/diff/renderer.php @@ -17,7 +17,7 @@ if (!defined('IN_PHPBB')) } /** -* Code from pear.php.net, Text_Diff-1.0.0 package +* Code from pear.php.net, Text_Diff-1.1.0 package * http://pear.php.net/package/Text_Diff/ * * Modified by phpBB Group to meet our coding standards |