author | Dan Fuhry <dan@enanocms.org> |
Mon, 05 Dec 2011 08:16:00 -0500 | |
changeset 1356 | e80b5733ce9d |
parent 1308 | f9bee9b125ee |
permissions | -rw-r--r-- |
1 | 1 |
<?php |
2 |
||
166
d53cc29308f4
Rebrand as 1.1.1; everything should now be bumped to "unstable" status
Dan
parents:
163
diff
changeset
|
3 |
/* |
1 | 4 |
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between |
1081
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1073
diff
changeset
|
5 |
* Copyright (C) 2006-2009 Dan Fuhry |
1 | 6 |
* |
7 |
* This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License |
|
8 |
* as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. |
|
9 |
* |
|
10 |
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied |
|
11 |
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. |
|
12 |
* |
|
13 |
* This script contains code originally found in MediaWiki (http://www.mediawiki.org). MediaWiki is also licensed under |
|
1027
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
14 |
* the GPLv2 or later; see the file GPL included with this package for details. |
1 | 15 |
* |
16 |
* We're using the MW parser because the Text_Wiki version simply refused to work under PHP 5.2.0. Porting this was |
|
17 |
* _not_ easy. <leaves to get cup of coffee> |
|
18 |
*/ |
|
19 |
||
1027
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
20 |
global $mStripState, $wgRandomKey; |
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
21 |
$mStripState = Array(); |
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
22 |
|
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
23 |
/** |
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
24 |
* emulate mediawiki parser, including stripping, etc. |
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
25 |
* |
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
26 |
* @param string $text the text to parse |
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
27 |
* @return string |
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
28 |
* @access public |
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
29 |
*/ |
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
30 |
|
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
31 |
function process_tables( $text ) |
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
32 |
{ |
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
33 |
// include some globals, do some parser stuff that would normally be done in the parent parser function |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
34 |
global $mStripState; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
35 |
$x =& $mStripState; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
36 |
|
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
37 |
// parse the text |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
38 |
$text = doTableStuff($text); |
1027
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
39 |
|
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
40 |
return $text; |
1027
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
41 |
} |
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
42 |
|
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
43 |
/** |
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
44 |
* parse the wiki syntax used to render tables |
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
45 |
* |
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
46 |
* @param string $t the text to parse |
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
47 |
* @return string |
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
48 |
* @access private |
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
49 |
*/ |
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
50 |
function doTableStuff( $t ) { |
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
51 |
|
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
52 |
$t = explode ( "\n" , $t ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
53 |
$td = array () ; # Is currently a td tag open? |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
54 |
$ltd = array () ; # Was it TD or TH? |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
55 |
$tr = array () ; # Is currently a tr tag open? |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
56 |
$ltr = array () ; # tr attributes |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
57 |
$has_opened_tr = array(); # Did this table open a <tr> element? |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
58 |
$indent_level = 0; # indent level of the table |
1308
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
59 |
$row_count = 0; |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
60 |
foreach ( $t AS $k => $line ) |
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
61 |
{ |
1308
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
62 |
$line = trim ( $line ) ; |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
63 |
$first_char = substr ( $line , 0 , 1 ) ; |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
64 |
if ( preg_match( '/^(:*)\{\|(.*)$/', $line, $matches ) ) { |
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
65 |
$indent_level = strlen( $matches[1] ); |
1027
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
66 |
|
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
67 |
$attributes = unstripForHTML( $matches[2] ); |
1308
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
68 |
$styled_table = false; |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
69 |
if ( trim($attributes) == "styled" ) |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
70 |
{ |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
71 |
$attributes='cellspacing="1" cellpadding="4"'; |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
72 |
$styled_table = true; |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
73 |
} |
1027
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
74 |
|
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
75 |
$t[$k] = str_repeat( '<dl><dd>', $indent_level ) . |
1308
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
76 |
( $styled_table ? '<div class="tblholder">' : '' ) . |
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
77 |
'<table' . fixTagAttributes( $attributes, 'table' ) . '>' ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
78 |
array_push ( $td , false ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
79 |
array_push ( $ltd , '' ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
80 |
array_push ( $tr , false ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
81 |
array_push ( $ltr , '' ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
82 |
array_push ( $has_opened_tr, false ); |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
83 |
} |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
84 |
else if ( count ( $td ) == 0 ) { } # Don't do any of the following |
1308
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
85 |
else if ( '|}' == substr ( $line , 0 , 2 ) ) { |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
86 |
$z = "</table>" . ( $styled_table ? '</div>' : '' ) . substr ( $line , 2); |
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
87 |
$l = array_pop ( $ltd ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
88 |
if ( !array_pop ( $has_opened_tr ) ) $z = "<tr><td></td></tr>" . $z ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
89 |
if ( array_pop ( $tr ) ) $z = '</tr>' . $z ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
90 |
if ( array_pop ( $td ) ) $z = '</'.$l.'>' . $z ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
91 |
array_pop ( $ltr ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
92 |
$t[$k] = $z . str_repeat( '</dd></dl>', $indent_level ); |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
93 |
} |
1308
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
94 |
else if ( '|-' == substr ( $line , 0 , 2 ) ) { # Allows for |--------------- |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
95 |
$row_count++; |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
96 |
$line = substr ( $line , 1 ) ; |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
97 |
while ( $line != '' && substr ( $line , 0 , 1 ) == '-' ) $line = substr ( $line , 1 ) ; |
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
98 |
$z = '' ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
99 |
$l = array_pop ( $ltd ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
100 |
array_pop ( $has_opened_tr ); |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
101 |
array_push ( $has_opened_tr , true ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
102 |
if ( array_pop ( $tr ) ) $z = '</tr>' . $z ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
103 |
if ( array_pop ( $td ) ) $z = '</'.$l.'>' . $z ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
104 |
array_pop ( $ltr ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
105 |
$t[$k] = $z ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
106 |
array_push ( $tr , false ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
107 |
array_push ( $td , false ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
108 |
array_push ( $ltd , '' ) ; |
1308
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
109 |
$attributes = unstripForHTML( $line ); |
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
110 |
array_push ( $ltr , fixTagAttributes( $attributes, 'tr' ) ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
111 |
} |
1308
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
112 |
else if ( '|' == $first_char || '!' == $first_char || '|+' == substr ( $line , 0 , 2 ) ) { # Caption |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
113 |
# $line is a table row |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
114 |
if ( '|+' == substr ( $line , 0 , 2 ) ) { |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
115 |
$first_char = '+' ; |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
116 |
$line = substr ( $line , 1 ) ; |
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
117 |
} |
1308
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
118 |
$after = substr ( $line , 1 ) ; |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
119 |
if ( $first_char == '!' ) $after = str_replace ( '!!' , '||' , $after ) ; |
1027
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
120 |
|
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
121 |
// Split up multiple cells on the same line. |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
122 |
// FIXME: This can result in improper nesting of tags processed |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
123 |
// by earlier parser steps, but should avoid splitting up eg |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
124 |
// attribute values containing literal "||". |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
125 |
$after = wfExplodeMarkup( '||', $after ); |
1027
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
126 |
|
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
127 |
$t[$k] = '' ; |
1027
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
128 |
|
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
129 |
# Loop through each table cell |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
130 |
foreach ( $after AS $theline ) |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
131 |
{ |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
132 |
$z = '' ; |
1308
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
133 |
if ( $first_char != '+' ) |
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
134 |
{ |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
135 |
$tra = array_pop ( $ltr ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
136 |
if ( !array_pop ( $tr ) ) $z = '<tr'.$tra.">\n" ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
137 |
array_push ( $tr , true ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
138 |
array_push ( $ltr , '' ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
139 |
array_pop ( $has_opened_tr ); |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
140 |
array_push ( $has_opened_tr , true ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
141 |
} |
1027
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
142 |
|
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
143 |
$l = array_pop ( $ltd ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
144 |
if ( array_pop ( $td ) ) $z = '</'.$l.'>' . $z ; |
1308
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
145 |
if ( $first_char == '|' ) $l = 'td' ; |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
146 |
else if ( $first_char == '!' ) $l = 'th' ; |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
147 |
else if ( $first_char == '+' ) $l = 'caption' ; |
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
148 |
else $l = '' ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
149 |
array_push ( $ltd , $l ) ; |
1027
98c052fc3337
First implementation of new parser; Text_Wiki is now gone. VERY BETA! WiP.
Dan
parents:
801
diff
changeset
|
150 |
|
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
151 |
# Cell parameters |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
152 |
$y = explode ( '|' , $theline , 2 ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
153 |
# Note that a '|' inside an invalid link should not |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
154 |
# be mistaken as delimiting cell parameters |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
155 |
if ( strpos( $y[0], '[[' ) !== false ) { |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
156 |
$y = array ($theline); |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
157 |
} |
1308
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
158 |
$attr_append = ''; |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
159 |
if ( $styled_table && $l == 'td' ) |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
160 |
{ |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
161 |
$rowclass = 1 + ($row_count % 2); |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
162 |
$attr_append .= ' class="row' . $rowclass . '"'; |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
163 |
} |
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
164 |
if ( count ( $y ) == 1 ) |
1308
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
165 |
{ |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
166 |
$y = "{$z}<{$l}{$attr_append}>{$y[0]}" ; |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
167 |
} |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
168 |
else |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
169 |
{ |
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
170 |
$attributes = unstripForHTML( $y[0] ); |
1308
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
171 |
if ( !strstr($attributes, "class=") ) |
f9bee9b125ee
Parser updates. Added the "styled" keyword to wikitables to allow them to be styled using the current theme's standard table skinning, and changes to how the image tag parser decides how to display an image (framed, inline or raw).
Dan Fuhry <dan@enanocms.org>
parents:
1227
diff
changeset
|
172 |
$attributes .= $attr_append; |
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
173 |
$y = "{$z}<{$l}".fixTagAttributes($attributes, $l).">{$y[1]}" ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
174 |
} |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
175 |
$t[$k] .= $y ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
176 |
array_push ( $td , true ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
177 |
} |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
178 |
} |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
179 |
} |
1 | 180 |
|
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
181 |
# Closing open td, tr && table |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
182 |
while ( count ( $td ) > 0 ) |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
183 |
{ |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
184 |
$l = array_pop ( $ltd ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
185 |
if ( array_pop ( $td ) ) $t[] = '</td>' ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
186 |
if ( array_pop ( $tr ) ) $t[] = '</tr>' ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
187 |
if ( !array_pop ( $has_opened_tr ) ) $t[] = "<tr><td></td></tr>" ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
188 |
$t[] = '</table></_paragraph_bypass>' ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
189 |
} |
1 | 190 |
|
1227
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
191 |
$t = implode ( "\n" , $t ) ; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
192 |
|
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
193 |
# special case: don't return empty table |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
194 |
if($t == "<table>\n<tr><td></td></tr>\n</table>") |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
195 |
$t = ''; |
bdac73ed481e
Going ahead with the switch to tabs. This is a major coding standards change! If any unusual parser bugs show up, check this changeset. Converted all .php, .js, .tpl, .css, and .json files and did basic testing.
Dan
parents:
1081
diff
changeset
|
196 |
return $t ; |
1 | 197 |
} |
198 |