diff options
| author | Guy Brand <gb@unistra.fr> | 2014-05-05 22:51:26 +0200 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2014-05-05 22:51:26 +0200 |
| commit | 43a2e077a27740ebb0f0bc49e4a3d288c8811d78 (patch) | |
| tree | e22f94855951702e622d4c40ac44f3031b3d5819 /lib/plugins/config/settings/config.metadata.php | |
| parent | c6af9e94ed5d7f7713359faac18543db9a9aee48 (diff) | |
| parent | 75930869ddcb31470ea7617eddfb882de02645df (diff) | |
| download | rpg-43a2e077a27740ebb0f0bc49e4a3d288c8811d78.tar.gz rpg-43a2e077a27740ebb0f0bc49e4a3d288c8811d78.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'lib/plugins/config/settings/config.metadata.php')
| -rw-r--r-- | lib/plugins/config/settings/config.metadata.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index f9dabfeb0..aaa32cd70 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -116,7 +116,7 @@ $meta['fullpath'] = array('onoff','_caution' => 'security'); $meta['typography'] = array('multichoice','_choices' => array(0,1,2)); $meta['dformat'] = array('string'); $meta['signature'] = array('string'); -$meta['showuseras'] = array('multichoice','_choices' => array('loginname','username','email','email_link')); +$meta['showuseras'] = array('multichoice','_choices' => array('loginname','username','username_link','email','email_link')); $meta['toptoclevel'] = array('multichoice','_choices' => array(1,2,3,4,5)); // 5 toc levels $meta['tocminheads'] = array('multichoice','_choices' => array(0,1,2,3,4,5,10,15,20)); $meta['maxtoclevel'] = array('multichoice','_choices' => array(0,1,2,3,4,5)); @@ -138,7 +138,7 @@ $meta['manager'] = array('string'); $meta['profileconfirm'] = array('onoff'); $meta['rememberme'] = array('onoff'); $meta['disableactions'] = array('disableactions', - '_choices' => array('backlink','index','recent','revisions','search','subscription','register','resendpwd','profile','profile_delete','edit','wikicode','check'), + '_choices' => array('backlink','index','recent','revisions','search','subscription','register','resendpwd','profile','profile_delete','edit','wikicode','check', 'rss'), '_combine' => array('subscription' => array('subscribe','unsubscribe'), 'wikicode' => array('source','export_raw'))); $meta['auth_security_timeout'] = array('numeric'); $meta['securecookie'] = array('onoff'); |