Merge pull request #5324 from rubencm/ticket/15760

[ticket/15760] Fix write_stream

phpBB/includes/acp/acp_database.php

@@ -192,8 +192,6 @@ class acp_database
 									fclose($fp);
 								}
 
-								$storage->track_file($file);
-
 								// Remove file from tmp
 								@unlink($temp_dir . '/' . $file);
 

phpBB/phpbb/attachment/upload.php

@@ -254,8 +254,6 @@ class upload
 				{
 					fclose($fp);
 				}
-
-				$this->storage->track_file($destination_name);
 			}
 			else
 			{

phpBB/phpbb/files/filespec_storage.php

@@ -456,8 +456,6 @@ class filespec_storage
 			{
 				fclose($fp);
 			}
-
-			$storage->track_file($this->destination_file);
 		}
 		catch (\phpbb\storage\exception\exception $e)
 		{

phpBB/phpbb/storage/adapter/local.php

@@ -348,6 +348,8 @@ class local implements adapter_interface, stream_interface
 			fclose($stream);
 			throw new exception('STORAGE_CANNOT_COPY_RESOURCE');
 		}
+
+		fclose($stream);
 	}
 
 	/**

phpBB/phpbb/storage/storage.php

@@ -212,7 +212,6 @@ class storage
 
 	/**
 	 * Writes a new file using a stream
-	 * The file needs to be tracked after using this method
 	 *
 	 * @param string	$path		The target file
 	 * @param resource	$resource	The resource
@@ -226,6 +225,7 @@ class storage
 		if ($adapter instanceof stream_interface)
 		{
 			$adapter->write_stream($path, $resource);
+			$this->track_file($path);
 		}
 		else
 		{