summaryrefslogtreecommitdiff
path: root/inc/template.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2011-11-27 10:50:03 +0100
committerAndreas Gohr <andi@splitbrain.org>2011-11-27 10:50:03 +0100
commit560f6ea3cdac2767863c3be3a9e7933b6e37e88f (patch)
tree6f51d4b3402458e4de1a596b93ec752c8ac747b2 /inc/template.php
parente0dd04a6493f1b7f7133f75c08f9ea55ee8bd50a (diff)
parentc66c7229a0dfc4f9f06dadda98408679fa7a18d6 (diff)
downloadrpg-560f6ea3cdac2767863c3be3a9e7933b6e37e88f.tar.gz
rpg-560f6ea3cdac2767863c3be3a9e7933b6e37e88f.tar.bz2
Merge branch 'master' into bcrypt
Diffstat (limited to 'inc/template.php')
-rw-r--r--inc/template.php13
1 files changed, 7 insertions, 6 deletions
diff --git a/inc/template.php b/inc/template.php
index b56d6c718..c70e407d6 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -480,10 +480,15 @@ function tpl_actionlink($type,$pre='',$suf='',$inner='',$return=false){
$linktarget = wl($id, $params);
}
$caption = $lang['btn_' . $type];
+ $akey = $addTitle = '';
+ if($accesskey){
+ $akey = 'accesskey="'.$accesskey.'" ';
+ $addTitle = ' ['.strtoupper($accesskey).']';
+ }
$out = tpl_link($linktarget, $pre.(($inner)?$inner:$caption).$suf,
'class="action ' . $type . '" ' .
- 'accesskey="' . $accesskey . '" rel="nofollow" ' .
- 'title="' . hsc($caption) . '"', 1);
+ $akey . 'rel="nofollow" ' .
+ 'title="' . hsc($caption).$addTitle . '"', 1);
}
if ($return) return $out;
echo $out;
@@ -626,10 +631,6 @@ function tpl_get_action($type) {
return false;
}
break;
- case 'subscribens':
- // Superseded by subscribe/subscription
- return '';
- break;
case 'media':
break;
default: