Merge pull request #224 from dokufreaks/secedit_greebo

Compatibility with new section editing in DokuWiki Greebo, fix #223
dokufreaks · Apr 17, 2018 · de79031 · de79031
2 parents 9b33049 + 9986c3a
commit de79031
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/syntax/editbtn.php b/syntax/editbtn.php
@@ -34,7 +34,12 @@ function handle($match, $state, $pos, Doku_Handler $handler) {
     function render($mode, Doku_Renderer $renderer, $data) {
         list($title) = $data;
         if ($mode == 'xhtml') {
-            $renderer->startSectionEdit(0, 'plugin_include_editbtn', $title);
+            if (defined('SEC_EDIT_PATTERN')) { // for DokuWiki Greebo and more recent versions
+                $renderer->startSectionEdit(0, array('target' => 'plugin_include_editbtn', 'name' => $title));
+            } else {
+                $renderer->startSectionEdit(0, 'plugin_include_editbtn', $title);
+            }
+
             $renderer->finishSectionEdit();
             return true;
         }

diff --git a/syntax/header.php b/syntax/header.php
@@ -56,7 +56,11 @@ function render($mode, Doku_Renderer $renderer, $data) {
             // the include header instruction is always at the beginning of the first section edit inside the include
             // wrap so there is no need to close a previous section edit.
             if ($lvl <= $conf['maxseclevel']) {
-                $classes[] = $renderer->startSectionEdit($pos, 'section', $headline);
+                if (defined('SEC_EDIT_PATTERN')) { // for DokuWiki Greebo and more recent versions
+                    $classes[] = $renderer->startSectionEdit($pos, array('target' => 'section', 'name' => $headline, 'hid' => $hid));
+                } else {
+                    $classes[] = $renderer->startSectionEdit($pos, 'section', $headline);
+                }
             }
             if ($classes) {
                 $renderer->doc .= ' class="'. implode(' ', $classes) . '"';

diff --git a/syntax/wrap.php b/syntax/wrap.php
@@ -36,14 +36,26 @@ function render($mode, Doku_Renderer $renderer, $data) {
             switch($state) {
                 case 'open':
                     if ($redirect) {
-                        $renderer->startSectionEdit(0, 'plugin_include_start', $page);
+                        if (defined('SEC_EDIT_PATTERN')) { // for DokuWiki Greebo and more recent versions
+                            $renderer->startSectionEdit(0, array('target' => 'plugin_include_start', 'name' => $page));
+                        } else {
+                            $renderer->startSectionEdit(0, 'plugin_include_start', $page);
+                        }
                     } else {
-                        $renderer->startSectionEdit(0, 'plugin_include_start_noredirect', $page);
+                        if (defined('SEC_EDIT_PATTERN')) { // for DokuWiki Greebo and more recent versions
+                            $renderer->startSectionEdit(0, array('target' => 'plugin_include_start_noredirect', 'name' => $page));
+                        } else {
+                            $renderer->startSectionEdit(0, 'plugin_include_start_noredirect', $page);
+                        }
                     }
                     $renderer->finishSectionEdit();
                     // Start a new section with type != section so headers in the included page
                     // won't print section edit buttons of the parent page
-                    $renderer->startSectionEdit(0, 'plugin_include_end', $page);
+                    if (defined('SEC_EDIT_PATTERN')) { // for DokuWiki Greebo and more recent versions
+                        $renderer->startSectionEdit(0, array('target' => 'plugin_include_end', 'name' => $page));
+                    } else {
+                        $renderer->startSectionEdit(0, 'plugin_include_end', $page);
+                    }
                     if ($secid === NULL) {
                         $id = '';
                     } else {