diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-03-13 20:49:39 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-03-13 20:49:39 +0100 |
| commit | 1c5a4c12137beeaf3c0713272fe90861acd87bf4 (patch) | |
| tree | 8d6f13059f93590fd8407d292877dc9cd44d6151 /phpBB | |
| parent | 2975566650b6eeeac57b215b6448b5fc12b8fc5d (diff) | |
| parent | 96491a70e8b61ba5700c78dd7b20fe9ca9a3b665 (diff) | |
| download | forums-1c5a4c12137beeaf3c0713272fe90861acd87bf4.tar forums-1c5a4c12137beeaf3c0713272fe90861acd87bf4.tar.gz forums-1c5a4c12137beeaf3c0713272fe90861acd87bf4.tar.bz2 forums-1c5a4c12137beeaf3c0713272fe90861acd87bf4.tar.xz forums-1c5a4c12137beeaf3c0713272fe90861acd87bf4.zip | |
Merge pull request #5533 from rubencm/ticket/15965
[ticket/15965] Fix hardcoded directory [3.2.x only]
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/config/default/container/services_console.yml | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/console/command/thumbnail/delete.php | 11 | ||||
| -rw-r--r-- | phpBB/phpbb/console/command/thumbnail/generate.php | 13 |
3 files changed, 21 insertions, 5 deletions
diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml index a327b74ac4..05e467ff8d 100644 --- a/phpBB/config/default/container/services_console.yml +++ b/phpBB/config/default/container/services_console.yml @@ -208,6 +208,7 @@ services: console.command.thumbnail.delete: class: phpbb\console\command\thumbnail\delete arguments: + - '@config' - '@user' - '@dbal.conn' - '%core.root_path%' @@ -217,6 +218,7 @@ services: console.command.thumbnail.generate: class: phpbb\console\command\thumbnail\generate arguments: + - '@config' - '@user' - '@dbal.conn' - '@cache' diff --git a/phpBB/phpbb/console/command/thumbnail/delete.php b/phpBB/phpbb/console/command/thumbnail/delete.php index 9f2ee822be..7b95c20cf2 100644 --- a/phpBB/phpbb/console/command/thumbnail/delete.php +++ b/phpBB/phpbb/console/command/thumbnail/delete.php @@ -19,6 +19,11 @@ use Symfony\Component\Console\Style\SymfonyStyle; class delete extends \phpbb\console\command\command { /** + * @var \phpbb\config\config + */ + protected $config; + + /** * @var \phpbb\db\driver\driver_interface */ protected $db; @@ -32,12 +37,14 @@ class delete extends \phpbb\console\command\command /** * Constructor * + * @param \config\config $config The config * @param \phpbb\user $user The user object (used to get language information) * @param \phpbb\db\driver\driver_interface $db Database connection * @param string $phpbb_root_path Root path */ - public function __construct(\phpbb\user $user, \phpbb\db\driver\driver_interface $db, $phpbb_root_path) + public function __construct(\phpbb\config\config $config, \phpbb\user $user, \phpbb\db\driver\driver_interface $db, $phpbb_root_path) { + $this->config = $config; $this->db = $db; $this->phpbb_root_path = $phpbb_root_path; @@ -101,7 +108,7 @@ class delete extends \phpbb\console\command\command $return = 0; while ($row = $this->db->sql_fetchrow($result)) { - $thumbnail_path = $this->phpbb_root_path . 'files/thumb_' . $row['physical_filename']; + $thumbnail_path = $this->phpbb_root_path . $this->config['upload_path'] . '/thumb_' . $row['physical_filename']; if (@unlink($thumbnail_path)) { diff --git a/phpBB/phpbb/console/command/thumbnail/generate.php b/phpBB/phpbb/console/command/thumbnail/generate.php index 64f7555336..1f6582b17b 100644 --- a/phpBB/phpbb/console/command/thumbnail/generate.php +++ b/phpBB/phpbb/console/command/thumbnail/generate.php @@ -20,6 +20,11 @@ use Symfony\Component\Console\Style\SymfonyStyle; class generate extends \phpbb\console\command\command { /** + * @var \phpbb\config\config + */ + protected $config; + + /** * @var \phpbb\db\driver\driver_interface */ protected $db; @@ -45,14 +50,16 @@ class generate extends \phpbb\console\command\command /** * Constructor * + * @param \config\config $config The config * @param \phpbb\user $user The user object (used to get language information) * @param \phpbb\db\driver\driver_interface $db Database connection * @param \phpbb\cache\service $cache The cache service * @param string $phpbb_root_path Root path * @param string $php_ext PHP extension */ - public function __construct(\phpbb\user $user, \phpbb\db\driver\driver_interface $db, \phpbb\cache\service $cache, $phpbb_root_path, $php_ext) + public function __construct(\phpbb\config\config $config, \phpbb\user $user, \phpbb\db\driver\driver_interface $db, \phpbb\cache\service $cache, $phpbb_root_path, $php_ext) { + $this->config = $config; $this->db = $db; $this->cache = $cache; $this->phpbb_root_path = $phpbb_root_path; @@ -126,8 +133,8 @@ class generate extends \phpbb\console\command\command { if (isset($extensions[$row['extension']]['display_cat']) && $extensions[$row['extension']]['display_cat'] == ATTACHMENT_CATEGORY_IMAGE) { - $source = $this->phpbb_root_path . 'files/' . $row['physical_filename']; - $destination = $this->phpbb_root_path . 'files/thumb_' . $row['physical_filename']; + $source = $this->phpbb_root_path . $this->config['upload_path'] . '/' . $row['physical_filename']; + $destination = $this->phpbb_root_path . $this->config['upload_path'] . '/thumb_' . $row['physical_filename']; if (create_thumbnail($source, $destination, $row['mimetype'])) { |