diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-08-02 21:52:50 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-08-02 21:52:50 +0200 |
| commit | 395e7d8e1e303ae87be5d88abc67947b89e1a5a4 (patch) | |
| tree | 4e91abd30543ca241c8528ab75d6a2264c43d151 /lib/plugins | |
| parent | 5b230a45afb9bb825ba148e699bdcbfc57957fb4 (diff) | |
| parent | 836a17626793ab95d666c62e9c21b3df2568eeb4 (diff) | |
| download | rpg-395e7d8e1e303ae87be5d88abc67947b89e1a5a4.tar.gz rpg-395e7d8e1e303ae87be5d88abc67947b89e1a5a4.tar.bz2 | |
Merge branch 'pull-request-245'
* pull-request-245:
coding corrections. correct type hint, remove unused variable assignment
HTTPClient don't pull too much bytes when no content-length is given
de/de-informal: localization updates (delete user function)
unit tests for self deleting of user accounts
FS#2751 - self deletion of user account
Conflicts:
inc/lang/de-informal/lang.php
inc/lang/de/lang.php
Diffstat (limited to 'lib/plugins')
| -rw-r--r-- | lib/plugins/config/lang/en/lang.php | 1 | ||||
| -rw-r--r-- | lib/plugins/config/settings/config.metadata.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 8d0e7b047..67d3ce51f 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -99,6 +99,7 @@ $lang['disableactions'] = 'Disable DokuWiki actions'; $lang['disableactions_check'] = 'Check'; $lang['disableactions_subscription'] = 'Subscribe/Unsubscribe'; $lang['disableactions_wikicode'] = 'View source/Export Raw'; +$lang['disableactions_profile_delete'] = 'Delete Own Account'; $lang['disableactions_other'] = 'Other actions (comma separated)'; $lang['auth_security_timeout'] = 'Authentication Security Timeout (seconds)'; $lang['securecookie'] = 'Should cookies set via HTTPS only be sent via HTTPS by the browser? Disable this option when only the login of your wiki is secured with SSL but browsing the wiki is done unsecured.'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 2fb08037d..5d9b049a4 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -128,7 +128,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','edit','wikicode','check'), + '_choices' => array('backlink','index','recent','revisions','search','subscription','register','resendpwd','profile','profile_delete','edit','wikicode','check'), '_combine' => array('subscription' => array('subscribe','unsubscribe'), 'wikicode' => array('source','export_raw'))); $meta['auth_security_timeout'] = array('numeric'); $meta['securecookie'] = array('onoff'); |