summaryrefslogtreecommitdiff
path: root/lib/plugins/config/settings/extra.class.php
diff options
context:
space:
mode:
authorGerrit Uitslag <klapinklapin@gmail.com>2014-09-29 21:45:27 +0200
committerGerrit Uitslag <klapinklapin@gmail.com>2014-09-29 21:45:27 +0200
commit59bc3b48fdffb76ee65a4b630be3ffa1f6c20c80 (patch)
treee87df15c5ca81556fd1925ad56ba404f664c890e /lib/plugins/config/settings/extra.class.php
parente0c26282a603881e8d2f839d94c28dbbfc57d71b (diff)
downloadrpg-59bc3b48fdffb76ee65a4b630be3ffa1f6c20c80.tar.gz
rpg-59bc3b48fdffb76ee65a4b630be3ffa1f6c20c80.tar.bz2
more scrutinizer issue improvements
Diffstat (limited to 'lib/plugins/config/settings/extra.class.php')
-rw-r--r--lib/plugins/config/settings/extra.class.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/plugins/config/settings/extra.class.php b/lib/plugins/config/settings/extra.class.php
index 83de802a3..02171fb77 100644
--- a/lib/plugins/config/settings/extra.class.php
+++ b/lib/plugins/config/settings/extra.class.php
@@ -122,7 +122,7 @@ if (!class_exists('setting_disableactions')) {
// make some language adjustments (there must be a better way)
// transfer some DokuWiki language strings to the plugin
- if (!$plugin->localised) $this->setupLocale();
+ if (!$plugin->localised) $plugin->setupLocale();
$plugin->lang[$this->_key.'_revisions'] = $lang['btn_revs'];
foreach ($this->_choices as $choice)
@@ -159,7 +159,7 @@ if (!class_exists('setting_license')) {
foreach($license as $key => $data){
$this->_choices[] = $key;
- $this->lang[$this->_key.'_o_'.$key] = $data['name'];
+ $this->lang[$this->_key.'_o_'.$key] = $data['name']; // stored in setting
}
parent::initialize($default,$local,$protected);
@@ -171,6 +171,7 @@ if (!class_exists('setting_license')) {
if (!class_exists('setting_renderer')) {
class setting_renderer extends setting_multichoice {
var $_prompts = array();
+ var $_format = null;
function initialize($default,$local,$protected) {
$format = $this->_format;
@@ -192,7 +193,7 @@ if (!class_exists('setting_renderer')) {
// make some language adjustments (there must be a better way)
// transfer some plugin names to the config plugin
- if (!$plugin->localised) $this->setupLocale();
+ if (!$plugin->localised) $plugin->setupLocale();
foreach ($this->_choices as $choice) {
if (!isset($plugin->lang[$this->_key.'_o_'.$choice])) {