diff --git a/phpBB/includes/avatar/driver/gallery.php b/phpBB/includes/avatar/driver/local.php
similarity index 93%
rename from phpBB/includes/avatar/driver/gallery.php
rename to phpBB/includes/avatar/driver/local.php
index b937332b2d..4014f29cbe 100644
--- a/phpBB/includes/avatar/driver/gallery.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
 * Handles avatars selected from the board gallery
 * @package avatars
 */
-class phpbb_avatar_driver_gallery extends phpbb_avatar_driver
+class phpbb_avatar_driver_local extends phpbb_avatar_driver
 {
 	/**
 	* Get the avatar url and dimensions
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 777c9c2060..da12d52d40 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -30,7 +30,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	*/
 	public function get_data($user_row, $ignore_config = false)
 	{
-		if (ignore_config || $this->config['allow_avatar_upload'])
+		if ($ignore_config || $this->config['allow_avatar_upload'])
 		{
 			return array(
 				'src' => $this->phpbb_root_path . 'download/file.' . $this->php_ext . '?avatar=' . $user_row['user_avatar'],