diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-05-01 11:08:48 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-05-01 11:08:48 +0000 |
| commit | 88ab6cb3bb4fa18ff09aaa69479da5e1563b6dde (patch) | |
| tree | a21c5903b255b09b2096cdd3747f5ccc4499368f /phpBB/includes/diff | |
| parent | 601bb75d3c19c8a2a3f98e9c912507f82677f1e2 (diff) | |
| download | forums-88ab6cb3bb4fa18ff09aaa69479da5e1563b6dde.tar forums-88ab6cb3bb4fa18ff09aaa69479da5e1563b6dde.tar.gz forums-88ab6cb3bb4fa18ff09aaa69479da5e1563b6dde.tar.bz2 forums-88ab6cb3bb4fa18ff09aaa69479da5e1563b6dde.tar.xz forums-88ab6cb3bb4fa18ff09aaa69479da5e1563b6dde.zip | |
stupid me forgot to add a function for backwards compatibility :/
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9505 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/diff')
| -rw-r--r-- | phpBB/includes/diff/diff.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php index 1533c4d7f3..2adc3a3e6e 100644 --- a/phpBB/includes/diff/diff.php +++ b/phpBB/includes/diff/diff.php @@ -516,6 +516,7 @@ class diff3 extends diff $label_end = array('>>>>>>> ' . $label2); $lines = array_merge($lines, $label_start, $edit->final1, $label_mid, $edit->final2, $label_end); + $this->_conflicting_blocks++; } else { @@ -527,6 +528,16 @@ class diff3 extends diff } /** + * Return merged output (used by the renderer) + * + * @return mixed the merged output + */ + function merged_output() + { + return $this->get_conflicts_content(); + } + + /** * Merge the output and use the new file code for conflicts */ function merged_new_output() |