diff options
| author | Hakan Sandell <sandell.hakan@gmail.com> | 2010-11-13 15:29:49 +0100 |
|---|---|---|
| committer | Hakan Sandell <sandell.hakan@gmail.com> | 2010-11-13 15:29:49 +0100 |
| commit | 14928129ac979d50664cff367377db5364f8e663 (patch) | |
| tree | c244ebec8400361b7f084503f3ae40b2142647d5 /inc/html.php | |
| parent | bcb79ff3b3b63c74a93cdf4762fa0cd1bb28d17a (diff) | |
| parent | ebb29737d32bc331541f78a1a47f33ba33919938 (diff) | |
| download | rpg-14928129ac979d50664cff367377db5364f8e663.tar.gz rpg-14928129ac979d50664cff367377db5364f8e663.tar.bz2 | |
Merge branch 'master' of git://github.com/splitbrain/dokuwiki
Diffstat (limited to 'inc/html.php')
| -rw-r--r-- | inc/html.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/inc/html.php b/inc/html.php index 02afa00e9..7f502afa5 100644 --- a/inc/html.php +++ b/inc/html.php @@ -162,11 +162,12 @@ function html_topbtn(){ * * @author Andreas Gohr <andi@splitbrain.org> */ -function html_btn($name,$id,$akey,$params,$method='get',$tooltip=''){ +function html_btn($name,$id,$akey,$params,$method='get',$tooltip='',$label=false){ global $conf; global $lang; - $label = $lang['btn_'.$name]; + if (!$label) + $label = $lang['btn_'.$name]; $ret = ''; $tip = ''; |