summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Hamann <michael@content-space.de>2012-05-11 17:34:26 +0200
committerMichael Hamann <michael@content-space.de>2012-05-11 18:14:51 +0200
commit8414853140930bdf4f14cfee2f8a532d47c07129 (patch)
treea0300e5a2fa6978c2aa9b72ed1473fe65423ad7a
parentdf08777d58fac730aae02fc6448b4085ae0d4b7c (diff)
downloadrpg-8414853140930bdf4f14cfee2f8a532d47c07129.tar.gz
rpg-8414853140930bdf4f14cfee2f8a532d47c07129.tar.bz2
tpl_get_action: Return empty params array instead of params string
This prevents an "Illegal string offset" error in PHP 5.4 in the test cases (the integration tests failed here with PHP 5.4).
-rw-r--r--inc/template.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/inc/template.php b/inc/template.php
index ab6aa925f..d007f47ef 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -580,7 +580,7 @@ function tpl_get_action($type) {
$accesskey = 'v';
}
}else{
- $params = '';
+ $params = array();
$type = 'show';
$accesskey = 'v';
}
@@ -597,7 +597,7 @@ function tpl_get_action($type) {
break;
case 'top':
$accesskey = 'x';
- $params = '';
+ $params = array();
$id = '#dokuwiki__top';
break;
case 'back':
@@ -606,7 +606,7 @@ function tpl_get_action($type) {
return false;
}
$id = $parent;
- $params = '';
+ $params = array();
$accesskey = 'b';
break;
case 'login':