Merge branch 'master' into stable

1 files changed, 11 insertions, 4 deletions

diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 5a3d945d1..37900b2c3 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -902,16 +902,23 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     }
 
     // $numrows not yet implemented
-    function table_open($maxcols = NULL, $numrows = NULL, $pos){
+    function table_open($maxcols = null, $numrows = null, $pos = null){
         global $lang;
         // initialize the row counter used for classes
         $this->_counter['row_counter'] = 0;
-        $this->doc .= '<div class="table ' . $this->startSectionEdit($pos, 'table') . '"><table class="inline">'.DOKU_LF;
+        $class = 'table';
+        if ($pos !== null) {
+            $class .= ' ' . $this->startSectionEdit($pos, 'table');
+        }
+        $this->doc .= '<div class="' . $class . '"><table class="inline">' .
+                      DOKU_LF;
     }
 
-    function table_close($pos){
+    function table_close($pos = null){
         $this->doc .= '</table></div>'.DOKU_LF;
-        $this->finishSectionEdit($pos);
+        if ($pos !== null) {
+            $this->finishSectionEdit($pos);
+        }
     }
 
     function tablerow_open(){