From 88ab6cb3bb4fa18ff09aaa69479da5e1563b6dde Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 1 May 2009 11:08:48 +0000 Subject: 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 --- phpBB/includes/diff/diff.php | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'phpBB/includes/diff') 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 { @@ -526,6 +527,16 @@ class diff3 extends diff return $lines; } + /** + * 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 */ -- cgit v1.2.1