diff options
| author | Guy Brand <gb@unistra.fr> | 2013-11-18 20:48:03 +0100 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2013-11-18 20:48:03 +0100 |
| commit | 9d6d3a45521ca9b4eecc9f264a6adfe12d2ed764 (patch) | |
| tree | d87417a2562e14e40f21012a9e1ede2d159239c5 /lib/tpl/dokuwiki/main.php | |
| parent | 0f71b9e8c36a27b7e476b43879f1cf9636a9958e (diff) | |
| parent | 14b3007921f7b66fc9e3621b861a3c83e7e9093c (diff) | |
| download | rpg-9d6d3a45521ca9b4eecc9f264a6adfe12d2ed764.tar.gz rpg-9d6d3a45521ca9b4eecc9f264a6adfe12d2ed764.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'lib/tpl/dokuwiki/main.php')
| -rw-r--r-- | lib/tpl/dokuwiki/main.php | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index f6ca4ed86..3bc46406a 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -75,22 +75,21 @@ $showSidebar = $hasSidebar && ($ACT=='show'); <ul> <?php $data = array( - 'edit' => tpl_action('edit', 1, 'li', 1, '<span>', '</span>'), - 'revert' => tpl_action('revert', 1, 'li', 1, '<span>', '</span>'), - 'revisions' => tpl_action('revisions', 1, 'li', 1, '<span>', '</span>'), - 'backlink' => tpl_action('backlink', 1, 'li', 1, '<span>', '</span>'), - 'subscribe' => tpl_action('subscribe', 1, 'li', 1, '<span>', '</span>'), - 'top' => tpl_action('top', 1, 'li', 1, '<span>', '</span>') + 'view' => 'main', + 'items' => array( + 'edit' => tpl_action('edit', 1, 'li', 1, '<span>', '</span>'), + 'revert' => tpl_action('revert', 1, 'li', 1, '<span>', '</span>'), + 'revisions' => tpl_action('revisions', 1, 'li', 1, '<span>', '</span>'), + 'backlink' => tpl_action('backlink', 1, 'li', 1, '<span>', '</span>'), + 'subscribe' => tpl_action('subscribe', 1, 'li', 1, '<span>', '</span>'), + 'top' => tpl_action('top', 1, 'li', 1, '<span>', '</span>') + ) ); // the page tools can be amended through a custom plugin hook - // if you're deriving from this template and your design is close enough to - // the dokuwiki template you might want to trigger a DOKUWIKI event instead - // of using $conf['template'] here - $hook = 'TEMPLATE_'.strtoupper($conf['template']).'_PAGETOOLS_DISPLAY'; - $evt = new Doku_Event($hook, $data); + $evt = new Doku_Event('TEMPLATE_PAGETOOLS_DISPLAY', $data); if($evt->advise_before()){ - foreach($evt->data as $k => $html) echo $html; + foreach($evt->data['items'] as $k => $html) echo $html; } $evt->advise_after(); unset($data); |