diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2010-11-07 17:38:39 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-11-07 17:38:39 +0100 |
| commit | 7a94cade57d6c4514101c374d895ed278c05bbb1 (patch) | |
| tree | 774de9d9c7c47a9e43c5ad6560bdea1a6bb94a7f /inc/html.php | |
| parent | 0ae96b5697f1f1fe192e5eade99490c475467b84 (diff) | |
| parent | eb97dcb864e05302756dcec4320c3c41866e4217 (diff) | |
| download | rpg-7a94cade57d6c4514101c374d895ed278c05bbb1.tar.gz rpg-7a94cade57d6c4514101c374d895ed278c05bbb1.tar.bz2 | |
Merge branch 'master' into stable
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 = ''; |