Merge branch '1.7' into php8

This commit is contained in:
xiaomlove
2022-03-31 16:43:51 +08:00
140 changed files with 21731 additions and 273 deletions
+3
View File
@@ -425,6 +425,9 @@ class Install
$this->doLog("[CREATE ENV] key: $key, new value: $value from example.");
$newData[$key] = $value;
}
if ($key == 'CACHE_DRIVER') {
$newData[$key] = 'redis';
}
if ($scene == 'install' || !file_exists($envFile)) {
if ($key == 'APP_ENV') {
$newData[$key] = 'production';
+2
View File
@@ -3,6 +3,8 @@ ini_set('error_reporting', E_ALL);
ini_set('display_errors', 0);
define('IN_NEXUS', true);
define('NEXUS_START', microtime(true));
require ROOT_PATH . 'include/globalfunctions.php';
require ROOT_PATH . 'include/functions.php';
require ROOT_PATH . 'vendor/autoload.php';
require ROOT_PATH . 'nexus/Database/helpers.php';
require ROOT_PATH . 'include/constants.php';
+1
View File
@@ -352,6 +352,7 @@ return array (
'watermarkquality' => '85',
'altthumbwidth' => '180',
'altthumbheight' => '135',
'download_support_passkey' => 'yes',
),
'advertisement' =>
array (