aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/avatar/manager.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2012-12-01 00:27:52 +0100
committerMarc Alexander <admin@m-a-styles.de>2012-12-01 00:27:52 +0100
commitd439f477105903ceb29652f23bcb7812d0f34d4d (patch)
tree2ee3eb00037896e8bf31c3a69b0b04db5d55b840 /phpBB/includes/avatar/manager.php
parent081440f6c4bd6b7c2838dd0587ed6a4dffc87d52 (diff)
downloadforums-d439f477105903ceb29652f23bcb7812d0f34d4d.tar
forums-d439f477105903ceb29652f23bcb7812d0f34d4d.tar.gz
forums-d439f477105903ceb29652f23bcb7812d0f34d4d.tar.bz2
forums-d439f477105903ceb29652f23bcb7812d0f34d4d.tar.xz
forums-d439f477105903ceb29652f23bcb7812d0f34d4d.zip
[feature/avatars] Fix docblocks and minor cosmetic issues
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/avatar/manager.php')
-rw-r--r--phpBB/includes/avatar/manager.php13
1 files changed, 4 insertions, 9 deletions
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 267ba24dc8..409d0d4eea 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -85,16 +85,11 @@ class phpbb_avatar_manager
return null;
}
+ /*
+ * There is no need to handle invalid avatar types as the following code
+ * will cause a ServiceNotFoundException if the type does not exist
+ */
$driver = $this->container->get($avatar_type);
- if ($driver !== false)
- {
- return $driver;
- }
- else
- {
- $message = "Invalid avatar driver class name '%s' provided.";
- trigger_error(sprintf($message, $avatar_type));
- }
return $driver;
}