diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2013-07-30 10:50:52 +0200 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2013-07-30 10:50:52 +0200 |
| commit | af07997c5ff7cc096965159d90158e3710d2d019 (patch) | |
| tree | defaf770e77a679436eb56291185905b547640d0 /lib/scripts/toolbar.js | |
| parent | bdac741579f8c6f00248d5d3ec635d4c2e08fb1e (diff) | |
| parent | 7d8a6abbb21979fd77dca10275ebb8e01a04b6e4 (diff) | |
| download | rpg-af07997c5ff7cc096965159d90158e3710d2d019.tar.gz rpg-af07997c5ff7cc096965159d90158e3710d2d019.tar.bz2 | |
Merge branch 'master' into configmgr_improvements
Conflicts:
inc/auth.php
inc/template.php
lib/plugins/authad/lang/zh/settings.php
lib/plugins/authldap/lang/en/settings.php
lib/plugins/authldap/lang/zh/settings.php
lib/plugins/authmysql/lang/zh/settings.php
lib/plugins/config/settings/config.class.php
lib/plugins/usermanager/admin.php
Diffstat (limited to 'lib/scripts/toolbar.js')
| -rw-r--r-- | lib/scripts/toolbar.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js index 059a4ba5c..6d75215e0 100644 --- a/lib/scripts/toolbar.js +++ b/lib/scripts/toolbar.js @@ -72,7 +72,7 @@ function initToolbar(tbid,edid,tb, allowblock){ * @author Andreas Gohr <andi@splitbrain.org> */ function tb_format(btn, props, edid) { - var sample = props.title || props.sample; + var sample = props.sample || props.title; insertTags(edid, fixtxt(props.open), fixtxt(props.close), |