From 27ab639fbea160af2a003cb6ce3b2394195da297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= <rubencm@gmail.com>
Date: Mon, 20 Mar 2017 11:49:34 +0100
Subject: [PATCH] [ticket/15134] Return false if error

PHPBB3-15134
---
 phpBB/phpbb/avatar/driver/upload.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php
index 607db9067c..4effa4c410 100644
--- a/phpBB/phpbb/avatar/driver/upload.php
+++ b/phpBB/phpbb/avatar/driver/upload.php
@@ -286,14 +286,15 @@ class upload extends \phpbb\avatar\driver\driver
 			try
 			{
 				$this->filesystem->remove($filename);
+				return true;
 			}
 			catch (\phpbb\filesystem\exception\filesystem_exception $e)
 			{
-				// Do nothing
+				// Fail is covered by return statement below
 			}
 		}
 
-		return true;
+		return false;
 	}
 
 	/**