[phpwiki-checkins] SF.net SVN: phpwiki:[6229] trunk/lib/plugin

[<var...@us...>]

Revision: 6229
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6229&view=rev
Author:   vargenau
Date:     2008-09-02 15:21:42 +0000 (Tue, 02 Sep 2008)

Log Message:
-----------
Link in the last cell of a table was not displayed as a link

Modified Paths:
--------------
    trunk/lib/plugin/MediawikiTable.php
    trunk/lib/plugin/RichTable.php

Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php	2008-09-02 14:03:40 UTC (rev 6228)
+++ trunk/lib/plugin/MediawikiTable.php	2008-09-02 15:21:42 UTC (rev 6229)
@@ -138,7 +138,7 @@
                 $line = substr($line,2);
                 $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",
@@ -206,7 +206,7 @@
         if (isset($row)) {
             if (isset($cell)) {
                 if (isset($content))
-                    $cell->pushContent(TransformText(trim($content)));
+                    $cell->pushContent(TransformText(trim($content), $markup, $basepage));
                 $row->pushContent($cell);
             }
             $tbody->pushContent($row);
@@ -233,15 +233,6 @@
     }
 }
 
-// $Log: not supported by cvs2svn $
-// Revision 1.2  2008/04/04 18:13:49  vargenau
-// Add tbody to table
-//
-// Revision 1.1  2008/01/31 20:40:10  vargenau
-// Implemented Mediawiki-like syntax for tables
-//
-//
-
 // For emacs users
 // Local Variables:
 // mode: php

Modified: trunk/lib/plugin/RichTable.php
===================================================================
--- trunk/lib/plugin/RichTable.php	2008-09-02 14:03:40 UTC (rev 6228)
+++ trunk/lib/plugin/RichTable.php	2008-09-02 15:21:42 UTC (rev 6229)
@@ -9,6 +9,7 @@
 /* 
  * Copyright (C) 2003 Sameer D. Sahasrabuddhe
  * Copyright (C) 2005 $ThePhpWikiProgrammingTeam
+ * Copyright (C) 2008 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -126,7 +127,7 @@
         if (isset($row)) {
             if (isset($cell)) {
                 if (isset($content))
-                    $cell->pushContent(TransformText($content));
+                    $cell->pushContent(TransformText($content, $markup, $basepage));
                 $row->pushContent($cell);
             }
             $table->pushContent($row);
@@ -152,26 +153,6 @@
     }
 }
 
-// $Log: not supported by cvs2svn $
-// Revision 1.7  2005/05/06 17:44:24  rurban
-// silence undefined offset 1 msg
-//
-// Revision 1.6  2005/04/09 08:16:00  rurban
-// fix RichTablePlugin embedded plugin invocation. Bug #1044245
-//
-// Revision 1.5  2004/06/14 11:31:39  rurban
-// renamed global $Theme to $WikiTheme (gforge nameclash)
-// inherit PageList default options from PageList
-//   default sortby=pagename
-// use options in PageList_Selectable (limit, sortby, ...)
-// added action revert, with button at action=diff
-// added option regex to WikiAdminSearchReplace
-//
-// Revision 1.4  2004/03/09 13:08:40  rurban
-// fix undefined TransformText error: load BlockParser,
-// get rid of warnings
-//
-
 // For emacs users
 // Local Variables:
 // mode: php


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.