summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--content_history_inc.php19
1 files changed, 8 insertions, 11 deletions
diff --git a/content_history_inc.php b/content_history_inc.php
index 6efcba7..b3c5c48 100644
--- a/content_history_inc.php
+++ b/content_history_inc.php
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
* @package liberty
* @subpackage functions
*/
@@ -39,15 +39,12 @@ if (isset($_REQUEST["delete"]) && isset($_REQUEST["hist"])) {
/**
* run 'pear install Text_Diff' to install the library,
*/
- if( $gBitSystem->isFeatureActive('liberty_inline_diff') ) {
- if( @include_once( 'PEAR.php') && @@include_once( 'Text/Diff.php' ) ) {
- include_once( 'Text/Diff/Renderer/inline.php' );
- $diff = &new Text_Diff($from_lines,$to_lines);
- $renderer = &new Text_Diff_Renderer_inline();
- $html = $renderer->render($diff);
- }
- }
- else {
+ if( $gBitSystem->isFeatureActive( 'liberty_inline_diff' ) && @include_once( 'Text/Diff.php' )) {
+ include_once( 'Text/Diff/Renderer/inline.php' );
+ $diff = &new Text_Diff($from_lines,$to_lines);
+ $renderer = &new Text_Diff_Renderer_inline();
+ $html = $renderer->render($diff);
+ } else {
include_once( UTIL_PKG_PATH.'diff.php');
$diffx = new WikiDiff($from_lines,$to_lines);
$fmt = new WikiUnifiedDiffFormatter;
@@ -72,4 +69,4 @@ if (isset($_REQUEST["delete"]) && isset($_REQUEST["hist"])) {
}
}
-?> \ No newline at end of file
+?>