downgrading text_wiki to 0.25.0 for compatibility reasons. tobias schlitt will take...

diff --git a/bundled-libs/.current_version b/bundled-libs/.current_version
index 7879f990f46dc885f70e0efce484188db6ec29d1..380faca8206855baf30421aecab2b9fa49d5dba1 100644 (file)
--- 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 291650a23a5587ba10af7166bcea7328200054a3..ce9375762ebbda14a2ab64afdf30c167c5dda5cb 100644 (file)
--- 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 9c525cb9b034b3e33ac301194e0e91d1ae338829..23effd2a2af692db168190a0d505185a4b9d7c80 100644 (file)
--- 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)