diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-06-09 17:55:25 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-06-09 17:55:25 +0200 |
| commit | b6232aa9b213fbf62f5ce351bc79220daf243cc6 (patch) | |
| tree | 0e169650c4b0bb9476b5f0f917bff6952b574e4d /phpBB/phpbb/avatar | |
| parent | 0c5af536f1de55b6ee30ab9f193b6ea7637ac5b1 (diff) | |
| parent | 92f43c5371f1f37bd6d77ade2fc5e2804b5cc49f (diff) | |
| download | forums-b6232aa9b213fbf62f5ce351bc79220daf243cc6.tar forums-b6232aa9b213fbf62f5ce351bc79220daf243cc6.tar.gz forums-b6232aa9b213fbf62f5ce351bc79220daf243cc6.tar.bz2 forums-b6232aa9b213fbf62f5ce351bc79220daf243cc6.tar.xz forums-b6232aa9b213fbf62f5ce351bc79220daf243cc6.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into develop-ascraeus
* github-nickvergessen/ticket/10073: (36 commits)
[ticket/10073] Fix button descriptions
[ticket/10073] Do not check disable boxes by default
[ticket/10073] Store values with config_text in the ACP
[ticket/10073] Move config values to config_text
[ticket/10073] Fix request usage
[ticket/10073] Deduplicate template variable names
[ticket/10073] Get service from container
[ticket/10073] Fix more "Contact Us" strings
[ticket/10073] Move template code into the template
[ticket/10073] Make contact page available when board is disabled
[ticket/10073] Change name of the ACP module
[ticket/10073] Deduplicate posting buttons code in ACP
[ticket/10073] Use phpbb_validate_email to verify email address
[ticket/10073] Add tests for new validate_email()
[ticket/10073] Split email validation from email ban and taken checks
[ticket/10073] Deduplicate the if statement
[ticket/10073] Fallback to board_contact when contact page is disabled
[ticket/10073] Remove language string from rebase conflict
[ticket/10073] Add ACP module to add bbcode text for contact admin info
[ticket/10073] Add new configs to the schema
...
Diffstat (limited to 'phpBB/phpbb/avatar')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/gravatar.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/phpbb/avatar/driver/gravatar.php b/phpBB/phpbb/avatar/driver/gravatar.php index 34b894c2a7..c4344ee6e8 100644 --- a/phpBB/phpbb/avatar/driver/gravatar.php +++ b/phpBB/phpbb/avatar/driver/gravatar.php @@ -81,7 +81,8 @@ class gravatar extends \phpbb\avatar\driver\driver array( 'email' => array( array('string', false, 6, 60), - array('email')) + array('email'), + ), ) ); |