diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 1109c64d00..656bf1546e 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -330,7 +330,8 @@ class acp_groups
 						$submit_ary['founder_manage'] = isset($_REQUEST['group_founder_manage']) ? 1 : 0;
 					}
 					
-					if ($config['allow_avatar']) {
+					if ($config['allow_avatar'])
+					{
 						// Handle avatar
 						$driver = request_var('avatar_driver', '');
 						if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$driver"])
diff --git a/phpBB/includes/avatar/driver/core/local.php b/phpBB/includes/avatar/driver/core/local.php
index ca82b9c175..a8ed8ad130 100644
--- a/phpBB/includes/avatar/driver/core/local.php
+++ b/phpBB/includes/avatar/driver/core/local.php
@@ -142,7 +142,8 @@ class phpbb_avatar_driver_core_local extends phpbb_avatar_driver
 
 			if ($dh)
 			{
-				while (($cat = readdir($dh)) !== false) {
+				while (($cat = readdir($dh)) !== false)
+				{
 					if ($cat[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $cat) && is_dir("$path/$cat"))
 					{
 						if ($ch = @opendir("$path/$cat"))
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index c2c3dbbbca..94c7614868 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -72,11 +72,16 @@ class phpbb_avatar_manager
 
 		$r = new ReflectionClass($avatar_type);
 
-		if ($r->isSubClassOf('phpbb_avatar_driver')) {
+		if ($r->isSubClassOf('phpbb_avatar_driver'))
+		{
 			$driver = new $avatar_type($this->config, $this->request, $this->phpbb_root_path, $this->phpEx, $this->cache);
-		} else if ($r->implementsInterface('phpbb_avatar_driver')) {
+		}
+		else if ($r->implementsInterface('phpbb_avatar_driver'))
+		{
 			$driver = new $avatar_type();
-		} else {
+		}
+		else
+		{
 			$message = "Invalid avatar driver class name '%s' provided. It must implement phpbb_avatar_driver_interface.";
 			trigger_error(sprintf($message, $avatar_type));
 		}