Tables: Fix Bug 20078, add test for it

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 5fc2974..3eafec2 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -839,7 +839,7 @@ class Parser {
                        }
                        $matches = array();
 
-                       if ( preg_match( '/^(:*)\{\|(.*)$/', $line , $matches ) ) {
+                       if ( preg_match( '/^(:*)\s*\{\|(.*)$/', $line , $matches ) ) {
                                $tables[] = array();
                                $table =& $this->last( $tables );
                                $table[0] = array(); // first row

diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index e9f36bb..4114ea5 100644 (file)
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -1422,7 +1422,27 @@ Table security: embedded pipes (http://lists.wikimedia.org/mailman/htdig/wikitec
 
 !! end
 
+!! test
+Indented Tables, bug 20078
+!! input
+: {| 
+| 1 || 2
+|- 
+| 3 || 4
+|}
+!! result
+<dl><dd><table>
+<tr>
+<td>1</td>
+<td>2</td>
+</tr>
+<tr>
+<td>3</td>
+<td>4</td>
+</tr>
+</table></dd></dl>
 
+!! end
 ###
 ### Internal links
 ###