diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-17 00:42:40 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-17 00:42:40 +0200 |
| commit | c9da435d3c952db59e8d0a3198ef23f48789672f (patch) | |
| tree | 9a85d547b64bcc61cc0417469f3b026d43885d9f /phpBB/phpbb/avatar/driver | |
| parent | 7f5aeeef012dcd9b5492e7eaebbbb3e56b5a3d00 (diff) | |
| parent | 89af1150718a184249d8040637969b03a3003596 (diff) | |
| download | forums-c9da435d3c952db59e8d0a3198ef23f48789672f.tar forums-c9da435d3c952db59e8d0a3198ef23f48789672f.tar.gz forums-c9da435d3c952db59e8d0a3198ef23f48789672f.tar.bz2 forums-c9da435d3c952db59e8d0a3198ef23f48789672f.tar.xz forums-c9da435d3c952db59e8d0a3198ef23f48789672f.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12721] Update rules descriptions
[ticket/12721] Add Generic.NamingConventions.ConstructorName in strict
[ticket/12721] Add Squiz.Functions.LowercaseFunctionKeywords in legacy
[ticket/12721] Add Squiz.ControlStructures.ForLoopDeclaration in legacy
[ticket/12721] Add Squiz.ControlStructures.ForEachLoopDeclaration
[ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacy
[ticket/12721] Add Generic.Functions.OpeningFunctionBraceBsdAllman
[ticket/12721] Add Squiz.Arrays.ArrayBracketSpacing in the legacy ruleset
[ticket/12721] Add Generic.Files.LowercasedFilename in the legacy ruleset
Diffstat (limited to 'phpBB/phpbb/avatar/driver')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/upload.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php index 7f77db5949..c43004f340 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -72,7 +72,7 @@ class upload extends \phpbb\avatar\driver\driver { $file = $upload->form_upload('avatar_upload_file'); } - elseif (!empty($this->config['allow_avatar_remote_upload']) && !empty($url)) + else if (!empty($this->config['allow_avatar_remote_upload']) && !empty($url)) { if (!preg_match('#^(http|https|ftp)://#i', $url)) { |