[evolvis-commits] r16686: Update from Phpwiki
mirabilos at evolvis.org
mirabilos at evolvis.org
Tue Mar 1 01:32:40 CET 2011
Author: mirabilos
Date: 2011-03-01 01:32:40 +0100 (Tue, 01 Mar 2011)
New Revision: 16686
Modified:
trunk/gforge_base/evolvisforge-5.1/src/plugins/wiki/www/INSTALL
trunk/gforge_base/evolvisforge-5.1/src/plugins/wiki/www/lib/plugin/MediawikiTable.php
trunk/gforge_base/evolvisforge-5.1/src/plugins/wiki/www/pgsrc/Help%2FMediawikiTablePlugin
Log:
Update from Phpwiki
Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/wiki/www/INSTALL
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/wiki/www/INSTALL 2011-03-01 00:32:35 UTC (rev 16685)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/wiki/www/INSTALL 2011-03-01 00:32:40 UTC (rev 16686)
@@ -2,10 +2,10 @@
PhpWiki requires a web server with at least PHP version 4.3.10.
PhpWiki was tested with 4.4.7 (centos4), 4.3.10, 4.4.9, 5.0.3,
-5.1.6 (centos5), 5.2.10, 5.3, 6.0.
+5.1.6 (centos5), 5.2.10, 5.3.2, 5.3.3.
-All users of PHP are strongly encouraged to upgrade to PHP 5.2.13
-or PHP 5.3.2 that are the supported versions.
+All users of PHP are strongly encouraged to upgrade to PHP 5.2.14
+or PHP 5.3.3 that are the supported versions.
Visit <http://www.php.net> for downloads and information.
You need the Perl regular expressions package compiled in; this is the
@@ -151,4 +151,4 @@
FIN
-$Id: INSTALL 7539 2010-06-17 09:36:41Z vargenau $
+$Id: INSTALL 7730 2010-11-08 14:48:23Z vargenau $
Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/wiki/www/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/wiki/www/lib/plugin/MediawikiTable.php 2011-03-01 00:32:35 UTC (rev 16685)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/wiki/www/lib/plugin/MediawikiTable.php 2011-03-01 00:32:40 UTC (rev 16686)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id: MediawikiTable.php 7721 2010-11-02 17:04:15Z vargenau $');
+// rcs_id('$Id: MediawikiTable.php 7729 2010-11-08 13:45:12Z vargenau $');
/*
* Copyright (C) 2003 Sameer D. Sahasrabuddhe
* Copyright (C) 2005 $ThePhpWikiProgrammingTeam
@@ -75,7 +75,7 @@
$argstr = str_replace("||", "\n| ", $argstr);
$argstr = str_replace("!!", "\n! ", $argstr);
- $lines = preg_split('/\n/', $argstr);
+ $lines = explode("\n", $argstr);
$table = HTML::table();
// We always generate an Id for the table.
@@ -123,13 +123,15 @@
$row->pushContent($cell);
unset($cell);
}
- if (isset($thead)) {
+ if (!empty($row->_content)) {
+ if (isset($thead)) {
$thead->pushContent($row);
$table->pushContent($thead);
unset($thead);
$tbody = HTML::tbody();
- } else {
+ } else {
$tbody->pushContent($row);
+ }
}
}
$row = HTML::tr();
Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/wiki/www/pgsrc/Help%FMediawikiTablePlugin
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/wiki/www/pgsrc/Help%2FMediawikiTablePlugin 2011-03-01 00:32:35 UTC (rev 16685)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/wiki/www/pgsrc/Help%2FMediawikiTablePlugin 2011-03-01 00:32:40 UTC (rev 16686)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Mon, 8 Nov 2010 10:51:04 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FMediawikiTablePlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FMediawikiTablePlugin 7727 2010-11-08 09:53:28Z vargenau $
Content-Type: application/x-phpwiki;
pagename=Help%2FMediawikiTablePlugin;
flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -83,8 +83,8 @@
|- style=height:100px
| Cell I
| **Cell II**, in bold
-|align=right, width="100%" |Cell III
-|- bgcolor=#f0f0ff, align=center
+|align=right width="100%" |Cell III
+|- bgcolor=#f0f0ff align=center
|Cell 1||Cell 2||Cell 3
|}
@@ -101,8 +101,8 @@
|- style=height:100px
| Cell I
| **Cell II**, in bold
-|align=right, width="100%" |Cell III
-|- bgcolor=#f0f0ff, align=center
+|align=right width="100%" |Cell III
+|- bgcolor=#f0f0ff align=center
|Cell 1||Cell 2||Cell 3
|}
}}}
@@ -121,7 +121,7 @@
* One
* Two
* Three
-|- bgcolor=#f0f0ff, align=center
+|- bgcolor=#f0f0ff align=center
|Current date || <<CurrentTime format=date>>
|}
@@ -140,7 +140,7 @@
* One
* Two
* Three
-|- bgcolor=#f0f0ff, align=center
+|- bgcolor=#f0f0ff align=center
|Current date || <<CurrentTime format=date>>
|}
}}}
More information about the evolvis-commits
mailing list