diff options
| author | Klap-in <klapinklapin@gmail.com> | 2013-01-26 21:03:14 +0100 |
|---|---|---|
| committer | Klap-in <klapinklapin@gmail.com> | 2013-01-26 21:03:14 +0100 |
| commit | 3a2c510523e4ea91ab270c3075349f319e4bc95e (patch) | |
| tree | 7fe2d24e5f4450cf78e9291e8a2899665274c636 /lib/plugins/config/settings | |
| parent | 5fd9b829e7d9947de0eeead685e0a0cf707eff88 (diff) | |
| parent | 1a40fc9935bd06a440a844e081e4bfce5fce2932 (diff) | |
| download | rpg-3a2c510523e4ea91ab270c3075349f319e4bc95e.tar.gz rpg-3a2c510523e4ea91ab270c3075349f319e4bc95e.tar.bz2 | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'lib/plugins/config/settings')
| -rw-r--r-- | lib/plugins/config/settings/config.metadata.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 3607f56c6..89824381b 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -126,7 +126,7 @@ $meta['_authentication'] = array('fieldset'); $meta['useacl'] = array('onoff'); $meta['autopasswd'] = array('onoff'); $meta['authtype'] = array('authtype'); -$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','lsmd5','crypt','mysql','my411','kmd5','pmd5','hmd5','bcrypt')); +$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','lsmd5','crypt','mysql','my411','kmd5','pmd5','hmd5','mediawiki','bcrypt','sha512')); $meta['defaultgroup']= array('string'); $meta['superuser'] = array('string'); $meta['manager'] = array('string'); |