Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2008-09-02 14:03:31
|
Revision: 6228
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6228&view=rev
Author: vargenau
Date: 2008-09-02 14:03:40 +0000 (Tue, 02 Sep 2008)
Log Message:
-----------
Fix tests with strpos
Modified Paths:
--------------
trunk/lib/plugin/MediawikiTable.php
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2008-09-01 15:31:22 UTC (rev 6227)
+++ trunk/lib/plugin/MediawikiTable.php 2008-09-02 14:03:40 UTC (rev 6228)
@@ -182,7 +182,7 @@
// | class="xxx" | [foo|bar]
$pospipe = strpos($line, "|");
$posbracket = strpos($line, "[");
- if (($pospipe) && ((!$posbracket) || ($posbracket > $pospipe))) {
+ if (($pospipe !== false) && (($posbracket === false) || ($posbracket > $pospipe))) {
$attrs = $this->_parse_attr(substr($line, 0, $pospipe));
foreach ($attrs as $key => $value) {
if (in_array ($key, array("id", "class", "title", "style",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2008-09-26 13:02:30
|
Revision: 6282
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6282&view=rev
Author: vargenau
Date: 2008-09-26 13:02:23 +0000 (Fri, 26 Sep 2008)
Log Message:
-----------
One tbody is enough
Modified Paths:
--------------
trunk/lib/plugin/MediawikiTable.php
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2008-09-26 09:38:17 UTC (rev 6281)
+++ trunk/lib/plugin/MediawikiTable.php 2008-09-26 13:02:23 UTC (rev 6282)
@@ -116,9 +116,14 @@
$row->pushContent($cell);
unset($cell);
}
- $tbody->pushContent($row);
- $table->pushContent($tbody);
- $tbody = HTML::tbody();
+ if (isset($thead)) {
+ $thead->pushContent($row);
+ $table->pushContent($thead);
+ unset($thead);
+ $tbody = HTML::tbody();
+ } else {
+ $tbody->pushContent($row);
+ }
}
$row = HTML::tr();
$attrs = $this->_parse_attr(substr($line,2));
@@ -163,10 +168,10 @@
}
if (substr($line,0,1) == "!") {
$cell = HTML::th(); // Header
- $tbody = HTML::thead();
+ $thead = HTML::thead();
} else {
$cell = HTML::td();
- $tbody = HTML::tbody();
+ if (!isset($tbody)) $tbody = HTML::tbody();
}
$line = substr($line, 1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-01-01 19:52:32
|
Revision: 6360
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6360&view=rev
Author: vargenau
Date: 2009-01-01 19:52:28 +0000 (Thu, 01 Jan 2009)
Log Message:
-----------
Use parse_attributes function from stdlib
Modified Paths:
--------------
trunk/lib/plugin/MediawikiTable.php
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2009-01-01 19:50:23 UTC (rev 6359)
+++ trunk/lib/plugin/MediawikiTable.php 2009-01-01 19:52:28 UTC (rev 6360)
@@ -90,7 +90,7 @@
}
if (($lines[0][0] != '|') and ($lines[0][0] != '!')) {
$line = array_shift($lines);
- $attrs = $this->_parse_attr($line);
+ $attrs = parse_attributes($line);
foreach ($attrs as $key => $value) {
if (in_array ($key, array("id", "class", "title", "style",
"bgcolor", "frame", "rules", "border",
@@ -126,7 +126,7 @@
}
}
$row = HTML::tr();
- $attrs = $this->_parse_attr(substr($line,2));
+ $attrs = parse_attributes(substr($line,2));
foreach ($attrs as $key => $value) {
if (in_array ($key, array("id", "class", "title", "style",
"bgcolor", "align", "valign"))) {
@@ -144,7 +144,7 @@
$pospipe = strpos($line, "|");
$posbracket = strpos($line, "[");
if (($pospipe !== false) && (($posbracket === false) || ($posbracket > $pospipe))) {
- $attrs = $this->_parse_attr(substr($line, 0, $pospipe));
+ $attrs = parse_attributes(substr($line, 0, $pospipe));
foreach ($attrs as $key => $value) {
if (in_array ($key, array("id", "class", "title", "style",
"align", "lang"))) {
@@ -188,7 +188,7 @@
$pospipe = strpos($line, "|");
$posbracket = strpos($line, "[");
if (($pospipe !== false) && (($posbracket === false) || ($posbracket > $pospipe))) {
- $attrs = $this->_parse_attr(substr($line, 0, $pospipe));
+ $attrs = parse_attributes(substr($line, 0, $pospipe));
foreach ($attrs as $key => $value) {
if (in_array ($key, array("id", "class", "title", "style",
"colspan", "rowspan", "width", "height",
@@ -219,23 +219,6 @@
}
return $table;
}
-
- function _parse_attr($line) {
- // We allow attributes with or without quotes (")
- // border=1, cellpadding="5"
- // style="font-family: sans-serif; border-top:1px solid #dddddd;"
- // What will not work is style with comma inside, e. g.
- // style="font-family: Verdana, Arial, Helvetica, sans-serif"
- $attr_chunks = preg_split("/\s*,\s*/", strtolower($line));
- $options = array();
- foreach ($attr_chunks as $attr_pair) {
- if (empty($attr_pair)) continue;
- $key_val = preg_split("/\s*=\s*/", $attr_pair);
- if (!empty($key_val[1]))
- $options[trim($key_val[0])] = trim(str_replace("\"", "", $key_val[1]));
- }
- return $options;
- }
}
// For emacs users
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-01-09 12:23:55
|
Revision: 6387
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6387&view=rev
Author: vargenau
Date: 2009-01-09 11:59:25 +0000 (Fri, 09 Jan 2009)
Log Message:
-----------
Numeric cells are right-aligned by default
Modified Paths:
--------------
trunk/lib/plugin/MediawikiTable.php
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2009-01-09 09:56:12 UTC (rev 6386)
+++ trunk/lib/plugin/MediawikiTable.php 2009-01-09 11:59:25 UTC (rev 6387)
@@ -8,7 +8,7 @@
/*
* Copyright (C) 2003 Sameer D. Sahasrabuddhe
* Copyright (C) 2005 $ThePhpWikiProgrammingTeam
- * Copyright (C) 2008 Alcatel-Lucent
+ * Copyright (C) 2008-2009 Alcatel-Lucent
*
* This file is part of PhpWiki.
*
@@ -110,7 +110,11 @@
if (isset($row)) {
if (isset($cell)) {
if (isset($content)) {
- $cell->pushContent(TransformText(trim($content), $markup, $basepage));
+ if (is_numeric(trim($content))) {
+ $cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($content)));
+ } else {
+ $cell->pushContent(TransformText(trim($content), $markup, $basepage));
+ }
unset($content);
}
$row->pushContent($cell);
@@ -167,7 +171,11 @@
if (((substr($line,0,1) == "|") or (substr($line,0,1) == "!")) and isset($row)) {
if (isset($cell)) {
if (isset ($content)) {
- $cell->pushContent(TransformText(trim($content), $markup, $basepage));
+ if (is_numeric(trim($content))) {
+ $cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($content)));
+ } else {
+ $cell->pushContent(TransformText(trim($content), $markup, $basepage));
+ }
unset($content);
}
$row->pushContent($cell);
@@ -203,7 +211,11 @@
}
}
$line=substr($line, $pospipe+1);
- $cell->pushContent(TransformText(trim($line), $markup, $basepage));
+ if (is_numeric(trim($content))) {
+ $cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($content)));
+ } else {
+ $cell->pushContent(TransformText(trim($content), $markup, $basepage));
+ }
continue;
}
}
@@ -216,8 +228,14 @@
}
if (isset($row)) {
if (isset($cell)) {
- if (isset($content))
- $cell->pushContent(TransformText(trim($content), $markup, $basepage));
+ if (isset($content)) {
+ if (is_numeric(trim($content))) {
+ $cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($content)));
+ } else {
+ $cell->pushContent(TransformText(trim($content), $markup, $basepage));
+ }
+
+ }
$row->pushContent($cell);
}
$tbody->pushContent($row);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-01-20 12:35:00
|
Revision: 6421
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6421&view=rev
Author: vargenau
Date: 2009-01-20 12:15:57 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
Test if content exists
Modified Paths:
--------------
trunk/lib/plugin/MediawikiTable.php
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2009-01-20 08:45:36 UTC (rev 6420)
+++ trunk/lib/plugin/MediawikiTable.php 2009-01-20 12:15:57 UTC (rev 6421)
@@ -211,6 +211,7 @@
}
}
$line=substr($line, $pospipe+1);
+ if (empty($content)) $content = '';
if (is_numeric(trim($content))) {
$cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($content)));
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-01-20 14:30:31
|
Revision: 6422
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6422&view=rev
Author: vargenau
Date: 2009-01-20 14:30:22 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
Fix regression: content and line mixup
Modified Paths:
--------------
trunk/lib/plugin/MediawikiTable.php
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2009-01-20 12:15:57 UTC (rev 6421)
+++ trunk/lib/plugin/MediawikiTable.php 2009-01-20 14:30:22 UTC (rev 6422)
@@ -211,11 +211,10 @@
}
}
$line=substr($line, $pospipe+1);
- if (empty($content)) $content = '';
- if (is_numeric(trim($content))) {
- $cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($content)));
+ if (is_numeric(trim($line))) {
+ $cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($line)));
} else {
- $cell->pushContent(TransformText(trim($content), $markup, $basepage));
+ $cell->pushContent(TransformText(trim($line), $markup, $basepage));
}
continue;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-02-11 20:06:25
|
Revision: 6482
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6482&view=rev
Author: vargenau
Date: 2009-02-11 20:06:17 +0000 (Wed, 11 Feb 2009)
Log Message:
-----------
Allow negative number in compact cell notation "|56||-78"
Modified Paths:
--------------
trunk/lib/plugin/MediawikiTable.php
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2009-02-05 14:48:07 UTC (rev 6481)
+++ trunk/lib/plugin/MediawikiTable.php 2009-02-11 20:06:17 UTC (rev 6482)
@@ -78,8 +78,8 @@
// We allow the compact Mediawiki syntax with:
// - multiple cells on the same line (separated by "||"),
// - multiple header cells on the same line (separated by "!!").
- $argstr = str_replace("||", "\n|", $argstr);
- $argstr = str_replace("!!", "\n!", $argstr);
+ $argstr = str_replace("||", "\n| ", $argstr);
+ $argstr = str_replace("!!", "\n! ", $argstr);
$lines = preg_split('/\n/', $argstr);
$table = HTML::table();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-02-16 13:47:48
|
Revision: 6503
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6503&view=rev
Author: vargenau
Date: 2009-02-16 13:47:43 +0000 (Mon, 16 Feb 2009)
Log Message:
-----------
We always generate an Id for the table
Modified Paths:
--------------
trunk/lib/plugin/MediawikiTable.php
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2009-02-16 12:54:59 UTC (rev 6502)
+++ trunk/lib/plugin/MediawikiTable.php 2009-02-16 13:47:43 UTC (rev 6503)
@@ -84,6 +84,11 @@
$lines = preg_split('/\n/', $argstr);
$table = HTML::table();
+ // We always generate an Id for the table.
+ // This is convenient for tables of class "sortable".
+ // If user provides an Id, the generated Id will be overwritten below.
+ $table->setAttr("id", GenerateId("MediawikiTable"));
+
if (substr($lines[0],0,2) == "{|") {
// Start of table
$lines[0] = substr($lines[0],2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-02-28 20:22:34
|
Revision: 6606
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6606&view=rev
Author: vargenau
Date: 2009-02-28 20:22:29 +0000 (Sat, 28 Feb 2009)
Log Message:
-----------
Allow pipe inside curly brackets
Modified Paths:
--------------
trunk/lib/plugin/MediawikiTable.php
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2009-02-28 20:03:55 UTC (rev 6605)
+++ trunk/lib/plugin/MediawikiTable.php 2009-02-28 20:22:29 UTC (rev 6606)
@@ -197,16 +197,20 @@
// If there is a "|" in the line, the start of line
// (before the "|") is made of attributes.
// The end of the line (after the "|") is the cell content
- // This is not true if the pipe is inside []
+ // This is not true if the pipe is inside [], {{}} or {{{}}}
// | [foo|bar]
// The following cases must work:
// | foo
// | [foo|bar]
// | class="xxx" | foo
// | class="xxx" | [foo|bar]
+ // | {{tmpl|arg=val}}
+ // | {{image.png|alt}}
+ // | {{{ xxx | yyy }}}
$pospipe = strpos($line, "|");
$posbracket = strpos($line, "[");
- if (($pospipe !== false) && (($posbracket === false) || ($posbracket > $pospipe))) {
+ $poscurly = strpos($line, "{");
+ if (($pospipe !== false) && (($posbracket === false) || ($posbracket > $pospipe)) && (($poscurly === false) || ($poscurly > $pospipe))) {
$attrs = parse_attributes(substr($line, 0, $pospipe));
foreach ($attrs as $key => $value) {
if (in_array ($key, array("id", "class", "title", "style",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-11-02 17:04:21
|
Revision: 7721
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7721&view=rev
Author: vargenau
Date: 2010-11-02 17:04:15 +0000 (Tue, 02 Nov 2010)
Log Message:
-----------
If user put and extra "|-" without cells just before "|}", we ignore it to get valid XHTML code
Modified Paths:
--------------
trunk/lib/plugin/MediawikiTable.php
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2010-10-22 18:38:33 UTC (rev 7720)
+++ trunk/lib/plugin/MediawikiTable.php 2010-11-02 17:04:15 UTC (rev 7721)
@@ -3,7 +3,7 @@
/*
* Copyright (C) 2003 Sameer D. Sahasrabuddhe
* Copyright (C) 2005 $ThePhpWikiProgrammingTeam
- * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
*
* This file is part of PhpWiki.
*
@@ -245,10 +245,20 @@
}
$row->pushContent($cell);
}
- $tbody->pushContent($row);
- $table->pushContent($tbody);
+ // If user put and extra "|-" without cells just before "|}"
+ // we ignore it to get valid XHTML code
+ if (!empty($row->_content)) {
+ $tbody->pushContent($row);
+ }
+ if (isset($tbody) && !empty($tbody->_content)) {
+ $table->pushContent($tbody);
+ }
}
- return $table;
+ if (isset($table) && !empty($table->_content)) {
+ return $table;
+ } else {
+ return HTML::raw('');
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-11-08 13:09:36
|
Revision: 7728
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7728&view=rev
Author: vargenau
Date: 2010-11-08 13:09:29 +0000 (Mon, 08 Nov 2010)
Log Message:
-----------
Allow extra "|-" anywhere
Modified Paths:
--------------
trunk/lib/plugin/MediawikiTable.php
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2010-11-08 09:53:28 UTC (rev 7727)
+++ trunk/lib/plugin/MediawikiTable.php 2010-11-08 13:09:29 UTC (rev 7728)
@@ -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();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-11-08 13:45:18
|
Revision: 7729
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7729&view=rev
Author: vargenau
Date: 2010-11-08 13:45:12 +0000 (Mon, 08 Nov 2010)
Log Message:
-----------
Use "explode" instead of "preg_split"
Modified Paths:
--------------
trunk/lib/plugin/MediawikiTable.php
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2010-11-08 13:09:29 UTC (rev 7728)
+++ trunk/lib/plugin/MediawikiTable.php 2010-11-08 13:45:12 UTC (rev 7729)
@@ -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.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-11-09 12:47:24
|
Revision: 7731
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7731&view=rev
Author: vargenau
Date: 2010-11-09 12:47:18 +0000 (Tue, 09 Nov 2010)
Log Message:
-----------
Add "scope" as possible attribute
Modified Paths:
--------------
trunk/lib/plugin/MediawikiTable.php
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2010-11-08 14:48:23 UTC (rev 7730)
+++ trunk/lib/plugin/MediawikiTable.php 2010-11-09 12:47:18 UTC (rev 7731)
@@ -213,7 +213,7 @@
if (($pospipe !== false) && (($posbracket === false) || ($posbracket > $pospipe)) && (($poscurly === false) || ($poscurly > $pospipe))) {
$attrs = parse_attributes(substr($line, 0, $pospipe));
foreach ($attrs as $key => $value) {
- if (in_array ($key, array("id", "class", "title", "style",
+ if (in_array ($key, array("id", "class", "title", "style", "scope",
"colspan", "rowspan", "width", "height",
"bgcolor", "align", "valign"))) {
$cell->setAttr($key, $value);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-11-09 13:20:23
|
Revision: 7732
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7732&view=rev
Author: vargenau
Date: 2010-11-09 13:20:16 +0000 (Tue, 09 Nov 2010)
Log Message:
-----------
Better handling of <thead>
Modified Paths:
--------------
trunk/lib/plugin/MediawikiTable.php
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2010-11-09 12:47:18 UTC (rev 7731)
+++ trunk/lib/plugin/MediawikiTable.php 2010-11-09 13:20:16 UTC (rev 7732)
@@ -76,8 +76,19 @@
$argstr = str_replace("!!", "\n! ", $argstr);
$lines = explode("\n", $argstr);
+
$table = HTML::table();
+ $caption = HTML::caption();
+ $thead = HTML::thead();
+ $tbody = HTML::tbody();
+ // Do we need a <thead>?
+ // 0 = unknown
+ // 1 = inside (parsing cells)
+ // 2 = false (no thead, only tbody)
+ // 3 = true (there is a thead)
+ $theadstatus = 0;
+
// We always generate an Id for the table.
// This is convenient for tables of class "sortable".
// If user provides an Id, the generated Id will be overwritten below.
@@ -104,7 +115,7 @@
return HTML::raw('');
}
- foreach ($lines as $line){
+ foreach ($lines as $line) {
if (substr($line,0,2) == "|}") {
// End of table
continue;
@@ -124,11 +135,9 @@
unset($cell);
}
if (!empty($row->_content)) {
- if (isset($thead)) {
+ if ($theadstatus == 1) { // inside
+ $theadstatus = 3; // true
$thead->pushContent($row);
- $table->pushContent($thead);
- unset($thead);
- $tbody = HTML::tbody();
} else {
$tbody->pushContent($row);
}
@@ -154,7 +163,6 @@
// Table caption
if (substr($line,0,2) == "|+") {
- $caption = HTML::caption();
$line = substr($line,2);
$pospipe = strpos($line, "|");
$posbracket = strpos($line, "[");
@@ -170,7 +178,6 @@
}
$caption->pushContent(trim($line));
- $table->pushContent($caption);
}
if (((substr($line,0,1) == "|") or (substr($line,0,1) == "!")) and isset($row)) {
@@ -186,11 +193,15 @@
$row->pushContent($cell);
}
if (substr($line,0,1) == "!") {
+ if ($theadstatus == 0) { // unknown
+ $theadstatus = 1; // inside
+ }
$cell = HTML::th(); // Header
- $thead = HTML::thead();
} else {
+ if ($theadstatus == 1) { // inside
+ $theadstatus = 2; // false
+ }
$cell = HTML::td();
- if (!isset($tbody)) $tbody = HTML::tbody();
}
$line = substr($line, 1);
@@ -252,11 +263,17 @@
if (!empty($row->_content)) {
$tbody->pushContent($row);
}
- if (isset($tbody) && !empty($tbody->_content)) {
- $table->pushContent($tbody);
- }
}
- if (isset($table) && !empty($table->_content)) {
+ if (!empty($caption->_content)) {
+ $table->pushContent($caption);
+ }
+ if (!empty($thead->_content)) {
+ $table->pushContent($thead);
+ }
+ if (!empty($tbody->_content)) {
+ $table->pushContent($tbody);
+ }
+ if (!empty($table->_content)) {
return $table;
} else {
return HTML::raw('');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-11-09 13:33:26
|
Revision: 7734
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7734&view=rev
Author: vargenau
Date: 2010-11-09 13:33:20 +0000 (Tue, 09 Nov 2010)
Log Message:
-----------
Multiple captions: the last one wins
Modified Paths:
--------------
trunk/lib/plugin/MediawikiTable.php
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2010-11-09 13:25:11 UTC (rev 7733)
+++ trunk/lib/plugin/MediawikiTable.php 2010-11-09 13:33:20 UTC (rev 7734)
@@ -177,7 +177,7 @@
$line=substr($line, $pospipe+1);
}
- $caption->pushContent(trim($line));
+ $caption->setContent(trim($line));
}
if (((substr($line,0,1) == "|") or (substr($line,0,1) == "!")) and isset($row)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-11-09 13:45:38
|
Revision: 7735
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7735&view=rev
Author: vargenau
Date: 2010-11-09 13:45:32 +0000 (Tue, 09 Nov 2010)
Log Message:
-----------
Parse caption
Modified Paths:
--------------
trunk/lib/plugin/MediawikiTable.php
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2010-11-09 13:33:20 UTC (rev 7734)
+++ trunk/lib/plugin/MediawikiTable.php 2010-11-09 13:45:32 UTC (rev 7735)
@@ -177,7 +177,7 @@
$line=substr($line, $pospipe+1);
}
- $caption->setContent(trim($line));
+ $caption->setContent(TransformInline(trim($line)));
}
if (((substr($line,0,1) == "|") or (substr($line,0,1) == "!")) and isset($row)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X