diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-11-16 22:59:29 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-11-16 22:59:29 +0100 |
| commit | ca30135391ef6b6c8149b7bb41aa840cf27d0a01 (patch) | |
| tree | 514e7b0b0f3a86aaa745435db8ec71694a6c53e3 /phpBB | |
| parent | 517d3f56ac72a686522e5eb0685952c44e889b79 (diff) | |
| download | forums-ca30135391ef6b6c8149b7bb41aa840cf27d0a01.tar forums-ca30135391ef6b6c8149b7bb41aa840cf27d0a01.tar.gz forums-ca30135391ef6b6c8149b7bb41aa840cf27d0a01.tar.bz2 forums-ca30135391ef6b6c8149b7bb41aa840cf27d0a01.tar.xz forums-ca30135391ef6b6c8149b7bb41aa840cf27d0a01.zip | |
[feature/avatars] Add gravatar to avatar settings
PHPBB3-10018
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/acp/board.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 322e1c55d8..4ad0b38708 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -118,6 +118,7 @@ class acp_board 'avatar_max_height' => array('lang' => 'MAX_AVATAR_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false), 'allow_avatar' => array('lang' => 'ALLOW_AVATARS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), + 'allow_avatar_gravatar' => array('lang' => 'ALLOW_GRAVATAR', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), 'allow_avatar_local' => array('lang' => 'ALLOW_LOCAL', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), 'allow_avatar_remote' => array('lang' => 'ALLOW_REMOTE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'allow_avatar_upload' => array('lang' => 'ALLOW_UPLOAD', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index a4380486cc..50121160c4 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -99,6 +99,7 @@ $lang = array_merge($lang, array( 'ALLOW_AVATARS' => 'Enable avatars', 'ALLOW_AVATARS_EXPLAIN' => 'Allow general usage of avatars;<br />If you disable avatars in general or avatars of a certain mode, the disabled avatars will no longer be shown on the board, but users will still be able to download their own avatars in the User Control Panel.', + 'ALLOW_GRAVATAR' => 'Enable gravatar avatars', 'ALLOW_LOCAL' => 'Enable gallery avatars', 'ALLOW_REMOTE' => 'Enable remote avatars', 'ALLOW_REMOTE_EXPLAIN' => 'Avatars linked to from another website.', |