mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

[ticket/15692] Remove useless code

Browse Source 
PHPBB3-15692
This commit is contained in:
Rubén Calvo
2018-08-07 00:16:37 +02:00
parent 69c1f5713c
commit 071d5fe997
1 changed files with 7 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
phpBB/phpbb/storage/storage.php
View File

@@ -112,18 +112,9 @@ class storage
throw new exception('STORAGE_FILE_EXISTS', $path); throw new exception('STORAGE_FILE_EXISTS', $path);
} }
try
{
$this->get_adapter()->put_contents($path, $content); $this->get_adapter()->put_contents($path, $content);
$this->track_file($path); $this->track_file($path);
} }
catch (\Exception $e)
{
$this->get_adapter()->delete($path);
$this->untrack_file($path);
throw $e;
}
}
/** /**
* Read the contents of a file * Read the contents of a file
@@ -198,16 +189,9 @@ class storage
throw new exception('STORAGE_FILE_EXISTS', $path_dest); throw new exception('STORAGE_FILE_EXISTS', $path_dest);
} }
try {
$this->get_adapter()->rename($path_orig, $path_dest); $this->get_adapter()->rename($path_orig, $path_dest);
$this->track_rename($path_orig, $path_dest); $this->track_rename($path_orig, $path_dest);
} }
catch (\Exception $e)
{
$this->untrack_file($path_dest);
throw $e;
}
}
/** /**
* Copies a file * Copies a file
@@ -231,17 +215,9 @@ class storage
throw new exception('STORAGE_FILE_EXISTS', $path_dest); throw new exception('STORAGE_FILE_EXISTS', $path_dest);
} }
try
{
$this->get_adapter()->copy($path_orig, $path_dest); $this->get_adapter()->copy($path_orig, $path_dest);
$this->track_file($path_dest); $this->track_file($path_dest);
} }
catch (\Exception $e)
{
$this->untrack_file($path_dest);
throw $e;
}
}
/** /**
* Reads a file as a stream * Reads a file as a stream
@@ -298,17 +274,9 @@ class storage
$adapter = $this->get_adapter(); $adapter = $this->get_adapter();
if ($adapter instanceof stream_interface) if ($adapter instanceof stream_interface)
{
try
{ {
$adapter->write_stream($path, $resource); $adapter->write_stream($path, $resource);
} }
catch (\Exception $e)
{
$adapter->delete($path);
$this->untrack_file($path);
}
}
else else
{ {
// Simulate the stream // Simulate the stream