Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
UNL Information Services
NMC-PHP-Framework
Commits
64f3bec4
Commit
64f3bec4
authored
May 07, 2013
by
Tim Steiner
Browse files
Update to use Horde_Text_Diff instead of Text_Diff
parent
079bb714
Changes
1
Hide whitespace changes
Inline
Side-by-side
library/Unl/View/Helper/HtmlDiff.php
View file @
64f3bec4
...
...
@@ -21,10 +21,10 @@ class Unl_View_Helper_HtmlDiff extends Zend_View_Helper_Abstract
$to
=
strtr
(
$to
,
array
(
'<'
=>
' <'
,
'>'
=>
'> '
));
// Now the real work.
Zend_Loader_Autoloader
::
getInstance
()
->
registerNamespace
(
'Horde_'
);
if
(
!
self
::
$_diffRenderer
)
{
require_once
'Text/Diff/Renderer/inline.php'
;
self
::
$_diffRenderer
=
new
Text_Diff_Renderer_inline
();
self
::
$_diffRenderer
=
new
Horde_Text_Diff_Renderer_inline
();
}
$currentArray
=
array
();
...
...
@@ -37,8 +37,7 @@ class Unl_View_Helper_HtmlDiff extends Zend_View_Helper_Abstract
$proposedArray
[]
=
$tok
;
}
require_once
'Text/Diff.php'
;
$diff
=
new
Text_Diff
(
'auto'
,
array
(
$currentArray
,
$proposedArray
));
$diff
=
new
Horde_Text_Diff
(
'auto'
,
array
(
$currentArray
,
$proposedArray
));
$diffHtml
=
(
$diff
->
isEmpty
()
?
$from
:
self
::
$_diffRenderer
->
render
(
$diff
));
// Undo the filtering.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment