diff --git a/.gitignore b/.gitignore index 7a09326f6..70c58f16d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ composer.phar configs/local.php data/avatars -data/torrent_files +data/uploads internal_data/atom internal_data/cache internal_data/log diff --git a/CHANGELOG.md b/CHANGELOG.md index e630b01c1..58b631211 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ - Some cleanup for attach mod [\#1250](https://github.com/torrentpier/torrentpier/pull/1250), [\#1255](https://github.com/torrentpier/torrentpier/pull/1255) ([belomaxorka](https://github.com/belomaxorka)) - Use "Views" string for thumbnails [\#1257](https://github.com/torrentpier/torrentpier/pull/1257) ([kovalensky](https://github.com/kovalensky)) - Show user's ban status [\#1258](https://github.com/torrentpier/torrentpier/pull/1258) ([kovalensky](https://github.com/kovalensky)) +- Changed default upload path [\#1261](https://github.com/torrentpier/torrentpier/pull/1261) ([belomaxorka](https://github.com/belomaxorka)) - New Crowdin updates [\#1203](https://github.com/torrentpier/torrentpier/pull/1203), [\#1222](https://github.com/torrentpier/torrentpier/pull/1222), [\#1251](https://github.com/torrentpier/torrentpier/pull/1251) ([Exileum](https://github.com/Exileum)) ## [v2.4.0-rc2](https://github.com/torrentpier/torrentpier/tree/v2.4.0-rc2) (2023-12-12) diff --git a/README.md b/README.md index 7c0fbcde1..2d43d391c 100644 --- a/README.md +++ b/README.md @@ -58,8 +58,8 @@ For installation, you need to follow a few simple steps: You must provide write permissions to the specified folders: * `data/avatars` -* `data/torrent_files` -* `data/torrent_files/thumbs` +* `data/uploads` +* `data/uploads/thumbs` * `internal_data/atom` * `internal_data/cache` * `internal_data/log` diff --git a/data/torrent_files/.htaccess b/data/uploads/.htaccess similarity index 100% rename from data/torrent_files/.htaccess rename to data/uploads/.htaccess diff --git a/data/torrent_files/thumbs/.keep b/data/uploads/thumbs/.keep similarity index 100% rename from data/torrent_files/thumbs/.keep rename to data/uploads/thumbs/.keep diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql index fe6aecfc9..26a3f9378 100644 --- a/install/sql/mysql.sql +++ b/install/sql/mysql.sql @@ -35,7 +35,7 @@ CREATE TABLE IF NOT EXISTS `bb_attachments_config` -- Records of bb_attachments_config -- ---------------------------- INSERT INTO `bb_attachments_config` -VALUES ('upload_dir', 'data/torrent_files'), +VALUES ('upload_dir', 'data/uploads'), ('upload_img', 'styles/images/icon_clip.gif'), ('topic_icon', 'styles/images/icon_clip.gif'), ('display_order', '0'), diff --git a/install/upgrade/changes.txt b/install/upgrade/changes.txt deleted file mode 100644 index 08a555c14..000000000 --- a/install/upgrade/changes.txt +++ /dev/null @@ -1,3 +0,0 @@ -Схема изменений начиная с версии 2.4.0: - -Изменения в базе: diff --git a/library/config.php b/library/config.php index 24a8af843..19dc11afa 100644 --- a/library/config.php +++ b/library/config.php @@ -584,7 +584,7 @@ $bb_cfg['file_id_ext'] = [ // Attachments $bb_cfg['attach'] = [ - 'upload_path' => DATA_DIR . '/torrent_files', // Storage path for torrent files + 'upload_path' => DATA_DIR . '/uploads', // Storage path for torrent files 'max_size' => 5 * 1024 * 1024, // TODO: Max size of a file ];