summaryrefslogtreecommitdiff
path: root/lib/tpl
diff options
context:
space:
mode:
authorChristopher Smith <chris@jalakai.co.uk>2013-10-04 17:59:13 +0100
committerChristopher Smith <chris@jalakai.co.uk>2013-10-04 17:59:13 +0100
commit4432749ab2140ede94ac1c724ab39b7219fdb406 (patch)
treeded234d57f69ea834f8d2f4d01d056d169a58361 /lib/tpl
parent7e428f98724dce1d9472be312d44ea66d799a2db (diff)
downloadrpg-4432749ab2140ede94ac1c724ab39b7219fdb406.tar.gz
rpg-4432749ab2140ede94ac1c724ab39b7219fdb406.tar.bz2
RS#2860 fix configuration option key to 'template'
Diffstat (limited to 'lib/tpl')
-rw-r--r--lib/tpl/dokuwiki/detail.php6
-rw-r--r--lib/tpl/dokuwiki/main.php6
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index 9c04ba8e7..c602830f7 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -122,11 +122,11 @@ header('X-UA-Compatible: IE=edge,chrome=1');
// Back to [ID]; @todo: transfer logic to backend
$data['img_backto'] = '<li><a href="'.wl($ID).'" class="back"><span>'.$lang['img_backto'].' '.$ID.'</span></a></li>';
- // the page tools can be ammended through a custom plugin hook
+ // 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['tpl'] here
- $hook = 'TEMPLATE_'.strtoupper($conf['tpl']).'_PAGETOOLS_DISPLAY';
+ // of using $conf['template'] here
+ $hook = 'TEMPLATE_'.strtoupper($conf['template']).'_PAGETOOLS_DISPLAY';
$evt = new Doku_Event($hook, $data);
if($evt->advise_before()){
foreach($evt->data as $k => $html) echo $html;
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 9e507d86d..f6ca4ed86 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -83,11 +83,11 @@ $showSidebar = $hasSidebar && ($ACT=='show');
'top' => tpl_action('top', 1, 'li', 1, '<span>', '</span>')
);
- // the page tools can be ammended through a custom plugin hook
+ // 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['tpl'] here
- $hook = 'TEMPLATE_'.strtoupper($conf['tpl']).'_PAGETOOLS_DISPLAY';
+ // of using $conf['template'] here
+ $hook = 'TEMPLATE_'.strtoupper($conf['template']).'_PAGETOOLS_DISPLAY';
$evt = new Doku_Event($hook, $data);
if($evt->advise_before()){
foreach($evt->data as $k => $html) echo $html;