Pass section id to included page edit button, fix warning dokufreaks#245

This fixes another undefined index 'hid' warning. Further, if the
include plugin sets its own section id, this section id is passed to
the editor now. This allows jumping back to the place from where the
page has been included. Currently, these section ids are only set when
a page is included for the first time.

Author: michitux

action.php

@@ -285,8 +285,10 @@ function handle_secedit_button(Doku_Event &$event, $params) {
             if ($page_stack[0]['writable']) {
                 $params = array('do' => 'edit',
                     'id' => $page_stack[0]['id']);
-                if ($page_stack[0]['redirect'])
+                if ($page_stack[0]['redirect']) {
                     $params['redirect_id'] = $ID;
+                    $params['hid'] = $data['hid'];
+                }
                 $event->result = '<div class="secedit">' . DOKU_LF .
                     html_btn('incledit', $page_stack[0]['id'], '',
                         $params, 'post',

helper.php

@@ -457,9 +457,11 @@ function _convert_instructions(&$ins, $lvl, $page, $sect, $flags, $root_id, $inc
             array_push($ins, array('plugin', array('include_closelastsecedit', array($endpos))));
         }
 
+        $include_secid = (isset($flags['include_secid']) ? $flags['include_secid'] : NULL);
+
         // add edit button
         if($flags['editbtn']) {
-            $this->_editbtn($ins, $page, $sect, $sect_title, ($flags['redirect'] ? $root_id : false));
+            $this->_editbtn($ins, $page, $sect, $sect_title, ($flags['redirect'] ? $root_id : false), $include_secid);
         }
 
         // add footer
@@ -484,7 +486,6 @@ function _convert_instructions(&$ins, $lvl, $page, $sect, $flags, $root_id, $inc
         }
 
         // add instructions entry wrapper
-        $include_secid = (isset($flags['include_secid']) ? $flags['include_secid'] : NULL);
         array_unshift($ins, array('plugin', array('include_wrap', array('open', $page, $flags['redirect'], $include_secid))));
         if (isset($flags['beforeeach']))
             array_unshift($ins, array('entity', array($flags['beforeeach'])));
@@ -516,11 +517,11 @@ function _footer($page, $sect, $sect_title, $flags, $footer_lvl, $root_id) {
      *
      * @author Michael Klier <[email protected]>
      */
-    function _editbtn(&$ins, $page, $sect, $sect_title, $root_id) {
+    function _editbtn(&$ins, $page, $sect, $sect_title, $root_id, $hid = '') {
         $title = ($sect) ? $sect_title : $page;
         $editbtn = array();
         $editbtn[0] = 'plugin';
-        $editbtn[1] = array('include_editbtn', array($title));
+        $editbtn[1] = array('include_editbtn', array($title, $hid));
         $ins[] = $editbtn;
     }
 

syntax/editbtn.php

@@ -26,10 +26,10 @@ function handle($match, $state, $pos, Doku_Handler $handler) {
      * @author Michael Klier <[email protected]>
      */
     function render($mode, Doku_Renderer $renderer, $data) {
-        list($title) = $data;
+        list($title, $hid) = $data;
         if ($mode == 'xhtml') {
             if (defined('SEC_EDIT_PATTERN')) { // for DokuWiki Greebo and more recent versions
-                $renderer->startSectionEdit(0, array('target' => 'plugin_include_editbtn', 'name' => $title));
+                $renderer->startSectionEdit(0, array('target' => 'plugin_include_editbtn', 'name' => $title, 'hid' => $hid));
             } else {
                 $renderer->startSectionEdit(0, 'plugin_include_editbtn', $title);
             }