diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:37 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:37 +0100 |
| commit | 54f94e0d428c5963ecca86a40247105e51288432 (patch) | |
| tree | 275c5ec85c31595d0341d6ad630565b7a6a4cdcc /phpBB/includes/diff | |
| parent | 1a09d0e238666a386a76878d6395986947b11c1e (diff) | |
| parent | b5535db081dca0187caae84cf7ffd8d6045dccba (diff) | |
| download | forums-54f94e0d428c5963ecca86a40247105e51288432.tar forums-54f94e0d428c5963ecca86a40247105e51288432.tar.gz forums-54f94e0d428c5963ecca86a40247105e51288432.tar.bz2 forums-54f94e0d428c5963ecca86a40247105e51288432.tar.xz forums-54f94e0d428c5963ecca86a40247105e51288432.zip | |
Merge commit 'release-3.0-RC6'
Diffstat (limited to 'phpBB/includes/diff')
| -rw-r--r-- | phpBB/includes/diff/diff.php | 9 | ||||
| -rw-r--r-- | phpBB/includes/diff/engine.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/diff/renderer.php | 23 |
3 files changed, 21 insertions, 18 deletions
diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php index 0308297c4e..0b3d14dbda 100644 --- a/phpBB/includes/diff/diff.php +++ b/phpBB/includes/diff/diff.php @@ -1,14 +1,15 @@ <?php -/** +/** * * @package diff * @version $Id$ -* @copyright (c) 2006 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2006 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ /** +* @ignore */ if (!defined('IN_PHPBB')) { @@ -66,7 +67,7 @@ class diff * </code> * * @return diff A Diff object representing the inverse of the original diff. - * Note that we purposely don't return a reference here, since + * Note that we purposely don't return a reference here, since * this essentially is a clone() method. */ function reverse() diff --git a/phpBB/includes/diff/engine.php b/phpBB/includes/diff/engine.php index c4802c2257..576839ea60 100644 --- a/phpBB/includes/diff/engine.php +++ b/phpBB/includes/diff/engine.php @@ -1,14 +1,15 @@ <?php -/** +/** * * @package diff * @version $Id$ -* @copyright (c) 2006 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2006 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ /** +* @ignore */ if (!defined('IN_PHPBB')) { diff --git a/phpBB/includes/diff/renderer.php b/phpBB/includes/diff/renderer.php index feb741762a..4157bc2cde 100644 --- a/phpBB/includes/diff/renderer.php +++ b/phpBB/includes/diff/renderer.php @@ -1,14 +1,15 @@ <?php -/** +/** * * @package diff * @version $Id$ -* @copyright (c) 2006 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2006 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ /** +* @ignore */ if (!defined('IN_PHPBB')) { @@ -269,7 +270,7 @@ class diff_renderer * Renders a unified diff * @package diff */ -class diff_renderer_unified extends diff_renderer +class diff_renderer_unified extends diff_renderer { var $_leading_context_lines = 4; var $_trailing_context_lines = 4; @@ -284,12 +285,12 @@ class diff_renderer_unified extends diff_renderer function _block_header($xbeg, $xlen, $ybeg, $ylen) { - if ($xlen != 1) + if ($xlen != 1) { $xbeg .= ',' . $xlen; } - if ($ylen != 1) + if ($ylen != 1) { $ybeg .= ',' . $ylen; } @@ -505,7 +506,7 @@ class diff_renderer_inline extends diff_renderer * * @package diff */ -class diff_renderer_raw extends diff_renderer +class diff_renderer_raw extends diff_renderer { var $_leading_context_lines = 4; var $_trailing_context_lines = 4; @@ -520,12 +521,12 @@ class diff_renderer_raw extends diff_renderer function _block_header($xbeg, $xlen, $ybeg, $ylen) { - if ($xlen != 1) + if ($xlen != 1) { $xbeg .= ',' . $xlen; } - if ($ylen != 1) + if ($ylen != 1) { $ybeg .= ',' . $ylen; } @@ -559,7 +560,7 @@ class diff_renderer_raw extends diff_renderer * * @package diff */ -class diff_renderer_side_by_side extends diff_renderer +class diff_renderer_side_by_side extends diff_renderer { var $_leading_context_lines = 3; var $_trailing_context_lines = 3; @@ -647,7 +648,7 @@ class diff_renderer_side_by_side extends diff_renderer break; case 'change': - // Pop the old/new stacks one by one, until both are empty. + // Pop the old/new stacks one by one, until both are empty. $oldsize = sizeof($change['old']); $newsize = sizeof($change['new']); $left = $right = ''; |