From 78d0727076641147ec79c546f1b17ce21af4450c Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Fri, 4 Feb 2005 13:44:45 +0000
Subject: [PATCH] prevent from php5 nameclash

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4551 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/diff.php    |  9 ++++++---
 lib/difflib.php | 11 +++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/diff.php b/lib/diff.php
index 1ecea8c86..ca6caae49 100644
--- a/lib/diff.php
+++ b/lib/diff.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: diff.php,v 1.49 2004-11-21 11:59:19 rurban Exp $');
+rcs_id('$Id: diff.php,v 1.50 2005-02-04 13:44:45 rurban Exp $');
 // diff.php
 //
 // PhpWiki diff output code.
@@ -96,7 +96,7 @@ class WordLevelDiff extends MappedDiff
         return $orig->getLines();
     }
 
-    function final () {
+    function _final () {
         $final = new _HWLDF_WordAccumulator;
 
         foreach ($this->edits as $edit) {
@@ -173,7 +173,7 @@ class HtmlUnifiedDiffFormatter extends UnifiedDiffFormatter
     function _changed($orig, $final) {
         $diff = new WordLevelDiff($orig, $final);
         $this->_lines($diff->orig(), 'original', '-');
-        $this->_lines($diff->final(), 'final', '+');
+        $this->_lines($diff->_final(), 'final', '+');
     }
 }
 
@@ -393,6 +393,9 @@ function showDiff (&$request) {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.49  2004/11/21 11:59:19  rurban
+// remove final \n to be ob_cache independent
+//
 // Revision 1.48  2004/06/14 11:31:36  rurban
 // renamed global $Theme to $WikiTheme (gforge nameclash)
 // inherit PageList default options from PageList
diff --git a/lib/difflib.php b/lib/difflib.php
index 74c0d2cde..a001e0798 100644
--- a/lib/difflib.php
+++ b/lib/difflib.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: difflib.php,v 1.11 2004-11-21 11:59:19 rurban Exp $');
+rcs_id('$Id: difflib.php,v 1.12 2005-02-04 13:44:45 rurban Exp $');
 
 // difflib.php
 //
@@ -583,7 +583,7 @@ class Diff
      *
      * @return array The sequence of strings.
      */
-    function final() {
+    function _final() {
         $lines = array();
 
         foreach ($this->edits as $edit) {
@@ -601,13 +601,13 @@ class Diff
     function _check ($from_lines, $to_lines) {
         if (serialize($from_lines) != serialize($this->orig()))
             trigger_error("Reconstructed original doesn't match", E_USER_ERROR);
-        if (serialize($to_lines) != serialize($this->final()))
+        if (serialize($to_lines) != serialize($this->_final()))
             trigger_error("Reconstructed final doesn't match", E_USER_ERROR);
 
         $rev = $this->reverse();
         if (serialize($to_lines) != serialize($rev->orig()))
             trigger_error("Reversed original doesn't match", E_USER_ERROR);
-        if (serialize($from_lines) != serialize($rev->final()))
+        if (serialize($from_lines) != serialize($rev->_final()))
             trigger_error("Reversed final doesn't match", E_USER_ERROR);
 
 
@@ -910,6 +910,9 @@ class BlockDiffFormatter extends DiffFormatter
 
 /**
  $Log: not supported by cvs2svn $
+ Revision 1.11  2004/11/21 11:59:19  rurban
+ remove final \n to be ob_cache independent
+
  Revision 1.10  2004/04/08 01:22:53  rurban
  fixed PageChange Notification
 
-- 
2.45.0