diff options
| author | Adrian Lang <mail@adrianlang.de> | 2011-04-22 22:35:43 +0200 |
|---|---|---|
| committer | Adrian Lang <mail@adrianlang.de> | 2011-04-22 22:35:43 +0200 |
| commit | 8ccf9c9785ec2b626bad30a88a21f02886845418 (patch) | |
| tree | 0ecd6103880e3350bd37ba11ae3872805ede1755 /lib/plugins/config/settings/extra.class.php | |
| parent | e2092379b1c3200832cb569781ec647db5aeef0f (diff) | |
| parent | 23d27376b2a2f6a1ccf0777c48435717494d85b1 (diff) | |
| download | rpg-8ccf9c9785ec2b626bad30a88a21f02886845418.tar.gz rpg-8ccf9c9785ec2b626bad30a88a21f02886845418.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
data/deleted.files
doku.php
lib/exe/xmlrpc.php
Diffstat (limited to 'lib/plugins/config/settings/extra.class.php')
| -rw-r--r-- | lib/plugins/config/settings/extra.class.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/plugins/config/settings/extra.class.php b/lib/plugins/config/settings/extra.class.php index f6b69ead1..b4e35b1cc 100644 --- a/lib/plugins/config/settings/extra.class.php +++ b/lib/plugins/config/settings/extra.class.php @@ -90,7 +90,6 @@ if (!class_exists('setting_disableactions')) { // transfer some DokuWiki language strings to the plugin if (!$plugin->localised) $this->setupLocale(); $plugin->lang[$this->_key.'_revisions'] = $lang['btn_revs']; - $plugin->lang[$this->_key.'_register'] = $lang['register']; foreach ($this->_choices as $choice) if (isset($lang['btn_'.$choice])) $plugin->lang[$this->_key.'_'.$choice] = $lang['btn_'.$choice]; |