mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-27 21:58:52 +00:00
More 5.3 compatibility.
git-svn-id: file:///svn/phpbb/trunk@8767 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
15e04808fc
commit
c119d0b424
3 changed files with 10 additions and 10 deletions
|
@ -324,7 +324,7 @@ class diff_op_copy extends diff_op
|
||||||
|
|
||||||
function &reverse()
|
function &reverse()
|
||||||
{
|
{
|
||||||
$reverse = &new diff_op_copy($this->final, $this->orig);
|
$reverse = new diff_op_copy($this->final, $this->orig);
|
||||||
return $reverse;
|
return $reverse;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -345,7 +345,7 @@ class diff_op_delete extends diff_op
|
||||||
|
|
||||||
function &reverse()
|
function &reverse()
|
||||||
{
|
{
|
||||||
$reverse = &new diff_op_add($this->orig);
|
$reverse = new diff_op_add($this->orig);
|
||||||
return $reverse;
|
return $reverse;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -366,7 +366,7 @@ class diff_op_add extends diff_op
|
||||||
|
|
||||||
function &reverse()
|
function &reverse()
|
||||||
{
|
{
|
||||||
$reverse = &new diff_op_delete($this->final);
|
$reverse = new diff_op_delete($this->final);
|
||||||
return $reverse;
|
return $reverse;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -387,7 +387,7 @@ class diff_op_change extends diff_op
|
||||||
|
|
||||||
function &reverse()
|
function &reverse()
|
||||||
{
|
{
|
||||||
$reverse = &new diff_op_change($this->final, $this->orig);
|
$reverse = new diff_op_change($this->final, $this->orig);
|
||||||
return $reverse;
|
return $reverse;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -160,7 +160,7 @@ class diff_engine
|
||||||
|
|
||||||
if ($copy)
|
if ($copy)
|
||||||
{
|
{
|
||||||
$edits[] = &new diff_op_copy($copy);
|
$edits[] = new diff_op_copy($copy);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Find deletes & adds.
|
// Find deletes & adds.
|
||||||
|
@ -178,15 +178,15 @@ class diff_engine
|
||||||
|
|
||||||
if ($delete && $add)
|
if ($delete && $add)
|
||||||
{
|
{
|
||||||
$edits[] = &new diff_op_change($delete, $add);
|
$edits[] = new diff_op_change($delete, $add);
|
||||||
}
|
}
|
||||||
else if ($delete)
|
else if ($delete)
|
||||||
{
|
{
|
||||||
$edits[] = &new diff_op_delete($delete);
|
$edits[] = new diff_op_delete($delete);
|
||||||
}
|
}
|
||||||
else if ($add)
|
else if ($add)
|
||||||
{
|
{
|
||||||
$edits[] = &new diff_op_add($add);
|
$edits[] = new diff_op_add($add);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -137,7 +137,7 @@ class diff_renderer
|
||||||
{
|
{
|
||||||
// Create a new block with as many lines as we need for the trailing context.
|
// Create a new block with as many lines as we need for the trailing context.
|
||||||
$context = array_slice($edit->orig, 0, $ntrail);
|
$context = array_slice($edit->orig, 0, $ntrail);
|
||||||
$block[] = &new diff_op_copy($context);
|
$block[] = new diff_op_copy($context);
|
||||||
}
|
}
|
||||||
|
|
||||||
$output .= $this->_block($x0, $ntrail + $xi - $x0, $y0, $ntrail + $yi - $y0, $block);
|
$output .= $this->_block($x0, $ntrail + $xi - $x0, $y0, $ntrail + $yi - $y0, $block);
|
||||||
|
@ -160,7 +160,7 @@ class diff_renderer
|
||||||
|
|
||||||
if ($context)
|
if ($context)
|
||||||
{
|
{
|
||||||
$block[] = &new diff_op_copy($context);
|
$block[] = new diff_op_copy($context);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$block[] = $edit;
|
$block[] = $edit;
|
||||||
|
|
Loading…
Add table
Reference in a new issue