summaryrefslogtreecommitdiff
path: root/inc/template.php
diff options
context:
space:
mode:
authorAnika Henke <anika@selfthinker.org>2012-06-29 17:51:09 +0100
committerAnika Henke <anika@selfthinker.org>2012-06-29 17:51:09 +0100
commit0c06a181819249c6a4a2a6c60e13f739df1f2253 (patch)
tree859377c572d0acbfc520b02304ef515bf3aebbe0 /inc/template.php
parentef7e36e4fd2a168977754f0aac1d855fb651f104 (diff)
parent5d0aaf958325f500ce69cfb79e69eb0d8f83fdeb (diff)
downloadrpg-0c06a181819249c6a4a2a6c60e13f739df1f2253.tar.gz
rpg-0c06a181819249c6a4a2a6c60e13f739df1f2253.tar.bz2
Merge branch 'master' of github.com:splitbrain/dokuwiki into frontend_improvements
Conflicts: lib/tpl/dokuwiki/css/basic.css
Diffstat (limited to 'inc/template.php')
-rw-r--r--inc/template.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/inc/template.php b/inc/template.php
index 131f34020..a18d7151f 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -576,7 +576,7 @@ function tpl_get_action($type) {
$accesskey = 'v';
}
}else{
- $params = '';
+ $params = array();
$type = 'show';
$accesskey = 'v';
}
@@ -593,7 +593,7 @@ function tpl_get_action($type) {
break;
case 'top':
$accesskey = 'x';
- $params = '';
+ $params = array();
$id = '#dokuwiki__top';
break;
case 'back':
@@ -602,7 +602,7 @@ function tpl_get_action($type) {
return false;
}
$id = $parent;
- $params = '';
+ $params = array();
$accesskey = 'b';
break;
case 'login':