makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

update diff engine to Text_Diff 1.1.0

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9251 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-01-12 16:47:58 +00:00
parent 0b313ad333
commit 507d8b0385
3 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
phpBB/includes/diff/diff.php
View file

@ -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/ * http://pear.php.net/package/Text_Diff/
* *
* Modified by phpBB Group to meet our coding standards * Modified by phpBB Group to meet our coding standards
@ -60,6 +60,48 @@ class diff
return $this->_edits; return $this->_edits;
} }
/**
* 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. * Computes a reversed diff.
* *

2
phpBB/includes/diff/engine.php
View file

@ -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) * http://pear.php.net/package/Text_Diff/ (native engine)
* *
* Modified by phpBB Group to meet our coding standards * Modified by phpBB Group to meet our coding standards

2
phpBB/includes/diff/renderer.php
View file

@ -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/ * http://pear.php.net/package/Text_Diff/
* *
* Modified by phpBB Group to meet our coding standards * Modified by phpBB Group to meet our coding standards