diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-17 00:42:39 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-17 00:42:39 +0200 |
| commit | 89af1150718a184249d8040637969b03a3003596 (patch) | |
| tree | 44ebf3864ded8edabde1eae392300911edc3f359 /phpBB/phpbb/avatar/driver/upload.php | |
| parent | 4d6afb26380d192efc556640499b6f5c43fbdf3c (diff) | |
| parent | afcca62784b51e34649f44905a27948bc3c8400c (diff) | |
| download | forums-89af1150718a184249d8040637969b03a3003596.tar forums-89af1150718a184249d8040637969b03a3003596.tar.gz forums-89af1150718a184249d8040637969b03a3003596.tar.bz2 forums-89af1150718a184249d8040637969b03a3003596.tar.xz forums-89af1150718a184249d8040637969b03a3003596.zip | |
Merge pull request #2603 from Nicofuma/ticket/12721
[ticket/12721] Improve the code sniffer: simple rules
* Nicofuma/ticket/12721:
[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/upload.php')
| -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)) { |