diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-09-02 13:33:06 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-09-02 13:33:06 +0000 |
| commit | 3ea2d53cb2b2554e944beb96fb98ea5c4c3aa23e (patch) | |
| tree | 99adb7132f8294497e6deb2615801229b2a061c3 /phpBB/includes/diff/diff.php | |
| parent | cf7a2614088ad7a17de201abfc6e8a93d4cea5d7 (diff) | |
| download | forums-3ea2d53cb2b2554e944beb96fb98ea5c4c3aa23e.tar forums-3ea2d53cb2b2554e944beb96fb98ea5c4c3aa23e.tar.gz forums-3ea2d53cb2b2554e944beb96fb98ea5c4c3aa23e.tar.bz2 forums-3ea2d53cb2b2554e944beb96fb98ea5c4c3aa23e.tar.xz forums-3ea2d53cb2b2554e944beb96fb98ea5c4c3aa23e.zip | |
some changes/fixes
git-svn-id: file:///svn/phpbb/trunk@6345 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/diff/diff.php')
| -rw-r--r-- | phpBB/includes/diff/diff.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php index 102f1119b2..fd2d557a19 100644 --- a/phpBB/includes/diff/diff.php +++ b/phpBB/includes/diff/diff.php @@ -430,12 +430,13 @@ class diff3 extends diff * * @param string $label1 the cvs file version/label from the original set of lines * @param string $label2 the cvs file version/label from the new set of lines + * @param string $label_sep the explanation between label1 and label2 - more of a helper for the user * @param bool $get_conflicts if set to true only the number of conflicts is returned * @param bool $merge_new if set to true the merged output will have the new file contents on a conflicting merge * * @return mixed the merged output */ - function merged_output($label1 = 'CURRENT_FILE', $label2 = 'NEW_FILE', $get_conflicts = false, $merge_new = false) + function merged_output($label1 = 'CURRENT_FILE', $label2 = 'NEW_FILE', $label_sep = 'DIFF_SEP_EXPLAIN', $get_conflicts = false, $merge_new = false) { global $user; @@ -454,6 +455,7 @@ class diff3 extends diff $label1 = (!empty($user->lang[$label1])) ? $user->lang[$label1] : $label1; $label2 = (!empty($user->lang[$label2])) ? $user->lang[$label2] : $label2; + $label_sep = (!empty($user->lang[$label_sep])) ? $user->lang[$label_sep] : $label_sep; $lines = array(); @@ -463,7 +465,7 @@ class diff3 extends diff { if (!$merge_new) { - $lines = array_merge($lines, array('<<<<<<<' . ($label1 ? ' ' . $label1 : '')), $edit->final1, array('======='), $edit->final2, array('>>>>>>>' . ($label2 ? ' ' . $label2 : ''))); + $lines = array_merge($lines, array('<<<<<<<' . ($label1 ? ' ' . $label1 : '')), $edit->final1, array('=======' . ($label_sep ? ' ' . $label_sep : '')), $edit->final2, array('>>>>>>>' . ($label2 ? ' ' . $label2 : ''))); } else { |