Author: metskem
Date: Thu Jul 31 12:50:39 2008
New Revision: 681456
URL: http://svn.apache.org/viewvc?rev=681456&view=rev
Log:
JSPWIKI-317: Fixed InvalidDiff in ExternalDiffProvider, thanks to Jan
Spitalnik.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=681456&r1=681455&r2=681456&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu Jul 31 12:50:39 2008
@@ -1,3 +1,9 @@
+2008-07-31 Harry Metske <[EMAIL PROTECTED]>
+
+ * no version bump
+
+ * JSPWIKI-317: Fixed InvalidDiff in ExternalDiffProvider, thanks to
Jan Spitalnik.
+
2008-07-31 Andrew Jaquith <ajaquith AT apache DOT org>
* 2.7.0-alpha-6
@@ -555,7 +561,7 @@
start with a dot. This is done in a fully backwards compatible manner,
so no changes to the repo is needed.
- * [JSPWIKI-100] Added two new parameters to ReferringPagesPlugin,
+ * [JSPWIKI-100]�Added two new parameters to ReferringPagesPlugin,
UnusedPagesPlugin, ReferredPagesPlugin, and UndefinedPagesPlugin:
show and showLastModified. Thanks to Harry Metske for the patch!
@@ -1082,7 +1088,7 @@
* [JSPWIKI-95]: Links to anchors with blanks work now. This introduces
a tiny, very tiny compatibility issue with links to headings changing
- case in some cases. Reported by Jürgen Weber.
+ case in some cases. Reported by J�rgen Weber.
* [JSPWIKI-125]: FilterManager now checks for version compatibility
of PageFilters by looking into the ini/jspwiki_module.xml. This was a
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java?rev=681456&r1=681455&r2=681456&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java
Thu Jul 31 12:50:39 2008
@@ -122,7 +122,7 @@
String htmlWikiDiff = TextUtil.replaceEntities( rawWikiDiff );
if (m_traditionalColorization) //FIXME, see comment near
declaration...
- diff = colorizeDiff(diff);
+ diff = colorizeDiff(htmlWikiDiff);
else
diff = htmlWikiDiff;
