3 files changed, 38 insertions, 0 deletions
diff --git a/phpBB/includes/avatar/driver.php b/phpBB/includes/avatar/driver.php
index 5d3b734f7b..5322f73c60 100644
--- a/phpBB/includes/avatar/driver.php
+++ b/phpBB/includes/avatar/driver.php
@@ -114,4 +114,12 @@ abstract class phpbb_avatar_driver
 	{
 		return false;
 	}
+
+	/**
+	* @TODO
+	**/
+	public function delete($user_row)
+	{
+		return true;
+	}
 }
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index dd1dbfa5a0..5b487745b1 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -122,6 +122,22 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	}
 
 	/**
+	* @inheritdoc
+	*/
+	public function delete($user_row)
+	{
+		$ext = substr(strrchr($user_row['user_avatar'], '.'), 1);
+		$filename = $this->phpbb_root_path . $this->config['avatar_path'] . '/' . $this->config['avatar_salt'] . '_' . $user_row['user_id'] . '.' . $ext;
+
+		if (file_exists($filename))
+		{
+			@unlink($filename);
+		}
+
+		return true;
+	}
+
+	/**
 	* @TODO
 	*/
 	private function can_upload()
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 6471c4cc9c..7137243898 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -47,6 +47,20 @@ class phpbb_avatar_manager
 			$this->load_valid_drivers();
 		}
 
+		// Legacy stuff...
+		switch ($avatar_type)
+		{
+			case AVATAR_LOCAL:
+				$avatar_type = 'local';
+				break;
+			case AVATAR_UPLOAD:
+				$avatar_type = 'upload';
+				break;
+			case AVATAR_REMOTE:
+				$avatar_type = 'remote';
+				break;
+		}
+
 		if (isset(self::$valid_drivers[$avatar_type]))
 		{
 			if ($new || !is_object(self::$valid_drivers[$avatar_type]))