maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

set version to 2.1.4 for bugfix release

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2024-01-05 14:33:45 +01:00
parent 7cc4c9fedb
commit 49d67d7c27
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/froxlor.sql.php
View File

@@ -726,7 +726,7 @@ opcache.validate_timestamps'),
('panel', 'logo_overridecustom', '0'), ('panel', 'logo_overridecustom', '0'),
('panel', 'settings_mode', '0'), ('panel', 'settings_mode', '0'),
('panel', 'menu_collapsed', '1'), ('panel', 'menu_collapsed', '1'),
('panel', 'version', '2.1.3'), ('panel', 'version', '2.1.4'),
('panel', 'db_version', '202312120'); ('panel', 'db_version', '202312120');

5
install/updates/froxlor/update_2.1.inc.php
View File

@@ -274,3 +274,8 @@ if (Froxlor::isFroxlorVersion('2.1.2')) {
Update::showUpdateStep("Updating from 2.1.2 to 2.1.3", false); Update::showUpdateStep("Updating from 2.1.2 to 2.1.3", false);
Froxlor::updateToVersion('2.1.3'); Froxlor::updateToVersion('2.1.3');
} }
if (Froxlor::isFroxlorVersion('2.1.3')) {
Update::showUpdateStep("Updating from 2.1.3 to 2.1.4", false);
Froxlor::updateToVersion('2.1.4');
}

4
lib/Froxlor/Cli/MasterCron.php
View File

@@ -263,6 +263,8 @@ final class MasterCron extends CliCommand
if ($jobcount > 0) { if ($jobcount > 0) {
if (Settings::Get('system.nssextrausers') == 1) { if (Settings::Get('system.nssextrausers') == 1) {
Extrausers::generateFiles($this->cronLog); Extrausers::generateFiles($this->cronLog);
// reload crond as shell users might use crontab and the user is only known to crond if reloaded
FileDir::safe_exec(escapeshellcmd(Settings::Get('system.crondreload')));
return; return;
} }
@@ -275,6 +277,8 @@ final class MasterCron extends CliCommand
FileDir::safe_exec('nscd -i group 1> /dev/null', $false_val, [ FileDir::safe_exec('nscd -i group 1> /dev/null', $false_val, [
'>' '>'
]); ]);
// reload crond as shell users might use crontab and the user is only known to crond if reloaded
FileDir::safe_exec(escapeshellcmd(Settings::Get('system.crondreload')));
} }
} }
} }

2
lib/Froxlor/Froxlor.php
View File

@@ -31,7 +31,7 @@ final class Froxlor
{ {
// Main version variable // Main version variable
const VERSION = '2.1.3'; const VERSION = '2.1.4';
// Database version (YYYYMMDDC where C is a daily counter) // Database version (YYYYMMDDC where C is a daily counter)
const DBVERSION = '202312120'; const DBVERSION = '202312120';