Merge branch 'php8' into section

This commit is contained in:
xiaomlove
2022-10-29 23:38:27 +08:00
3 changed files with 3 additions and 2 deletions

View File

@@ -1,6 +1,6 @@
<?php
defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.7.30');
defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-10-27');
defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-10-29');
defined('IN_TRACKER') || define('IN_TRACKER', false);
defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");

View File

@@ -407,7 +407,7 @@ class Update extends Install
foreach (glob("$extractDir/*") as $path) {
if (is_dir($path)) {
$excludes = array_merge(ToolRepository::BACKUP_EXCLUDES, ['public/favicon.ico', '.env']);
$excludes = array_merge(ToolRepository::BACKUP_EXCLUDES, ['public/favicon.ico', '.env', 'public/pic/category/chd']);
if (!in_array('composer', $includes)) {
$excludes[] = 'composer.lock';
$excludes[] = 'composer.json';

View File

@@ -817,6 +817,7 @@ if ($approvalStatusIconEnabled == 'yes' || (user_can('torrent-approval') && $app
if ($showApprovalStatusFilter && isset($_REQUEST['approval_status']) && is_numeric($_REQUEST['approval_status'])) {
$approvalStatus = intval($_REQUEST['approval_status']);
$wherea[] = "torrents.approval_status = $approvalStatus";
$addparam .= "approval_status=$approvalStatus&";
} elseif ($approvalStatusNoneVisible == 'no' && !user_can('torrent-approval')) {
$wherea[] = "torrents.approval_status = " . \App\Models\Torrent::APPROVAL_STATUS_ALLOW;
}