From: nohn <nohn>
Date: Thu, 14 Jul 2005 06:30:27 +0000 (+0000)
Subject: downgrading text_wiki to 0.25.0 for compatibility reasons. tobias schlitt will take... 
X-Git-Tag: 0.9~311
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=fe3d3d892374e60fcbf9438b6398a3a35c00f00a;p=s9y.git

downgrading text_wiki to 0.25.0 for compatibility reasons. tobias schlitt will take care of this and upgrade the wiki markup plugin to be compatible to text_wiki 1.0.0
---

diff --git a/bundled-libs/.current_version b/bundled-libs/.current_version
index 7879f99..380faca 100644
--- a/bundled-libs/.current_version
+++ b/bundled-libs/.current_version
@@ -4,5 +4,5 @@ Net_CheckIP          	1.1
 Net_Socket           	1.0.6
 Net_URL              	1.0.14
 PEAR			1.3.5
-Text_Wiki		1.0.0
+Text_Wiki		0.25.0
 XML_RPC 		1.3.2
\ No newline at end of file
diff --git a/bundled-libs/Text/Wiki.php b/bundled-libs/Text/Wiki.php
index 291650a..ce93757 100644
--- a/bundled-libs/Text/Wiki.php
+++ b/bundled-libs/Text/Wiki.php
@@ -8,11 +8,11 @@
 * 
 * @package Text_Wiki
 * 
-* @author Paul M. Jones <pmjones@php.net>
+* @author Paul M. Jones <pmjones@ciaweb.net>
 * 
 * @license LGPL
 * 
-* @version $Id: Wiki.php,v 1.29 2005/02/24 17:26:29 pmjones Exp $
+* @version $Id: Wiki.php,v 1.27 2005/02/01 16:56:56 pmjones Exp $
 * 
 */
 
@@ -40,15 +40,7 @@ require_once 'Text/Wiki/Render.php';
 * 
 * @package Text_Wiki
 * 
-<<<<<<< Wiki.php
-* @version 0.25.0
-*
-* @license LGPL
-=======
-* @author Paul M. Jones <pmjones@php.net>
-* 
-* @version 1.0.0
->>>>>>> 1.28
+* @version 0.25.0 beta
 * 
 */
 
@@ -98,7 +90,6 @@ class Text_Wiki {
         'Italic',
         'Tt',
         'Superscript',
-        'Subscript',
         'Revise',
         'Tighten'
     );
diff --git a/docs/NEWS b/docs/NEWS
index 9c525cb..23effd2 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -157,7 +157,7 @@ Version 0.8.3 ()
 	Net_Socket      to 1.0.6
 	Net_URL         to 1.0.14
 	PEAR		to 1.3.5
-	Text_Wiki	to 1.0.0
+	Text_Wiki	to 0.25.0
 	XML_RPC		to 1.3.2
      Fixing several bugs and vulnerabilities. (nohn)