Compare commits

...

6 Commits

Author SHA1 Message Date
Michael Kaufmann
00eb5ed87b set version to 0.9.40.1 for bugfix release
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2018-11-27 18:41:05 +01:00
Michael Kaufmann
1dc9ea6fb1 Merge branch '0.9.x' of github.com:Froxlor/Froxlor into 0.9.x 2018-11-27 11:50:25 +01:00
Michael Kaufmann
1b63936a26 fix typo in function name, fixes #601
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2018-11-27 11:50:05 +01:00
Michael Kaufmann
4760bddfe0 Merge pull request #585 from Xavjer/0.9.x
#584 - PHP deprecated warning
2018-11-13 17:38:54 +01:00
Cédric Wyss
03f62365b1 #584 - Revert change for PHP <=5.4.6 2018-11-13 17:29:39 +01:00
Cédric Wyss
3c0416ac44 #584 - PHP deprecated warning 2018-11-13 16:02:37 +01:00
5 changed files with 10 additions and 4 deletions

View File

@@ -581,7 +581,7 @@ if ($page == 'overview') {
// path cannot be the customers docroot // path cannot be the customers docroot
if ($path == makeCorrectDir($userinfo['documentroot'])) { if ($path == makeCorrectDir($userinfo['documentroot'])) {
standar_error('backupfoldercannotbedocroot'); standard_error('backupfoldercannotbedocroot');
} }
$backup_dbs = isset($_POST['backup_dbs']) ? intval($_POST['backup_dbs']) : 0; $backup_dbs = isset($_POST['backup_dbs']) ? intval($_POST['backup_dbs']) : 0;

View File

@@ -684,7 +684,7 @@ opcache.interned_strings_buffer'),
('panel', 'password_special_char_required', '0'), ('panel', 'password_special_char_required', '0'),
('panel', 'password_special_char', '!?<>§$%+#=@'), ('panel', 'password_special_char', '!?<>§$%+#=@'),
('panel', 'customer_hide_options', ''), ('panel', 'customer_hide_options', ''),
('panel', 'version', '0.9.40'), ('panel', 'version', '0.9.40.1'),
('panel', 'db_version', '201809280'); ('panel', 'db_version', '201809280');

View File

@@ -4066,3 +4066,9 @@ if (isFroxlorVersion('0.9.39.5')) {
showUpdateStep("Updating from 0.9.39.5 to 0.9.40", false); showUpdateStep("Updating from 0.9.39.5 to 0.9.40", false);
updateToVersion('0.9.40'); updateToVersion('0.9.40');
} }
if (isFroxlorVersion('0.9.40')) {
showUpdateStep("Updating from 0.9.40 to 0.9.40.1", false);
updateToVersion('0.9.40.1');
}

View File

@@ -29,7 +29,7 @@ function makeCorrectDir($dir) {
if (version_compare("5.4.6", PHP_VERSION, ">")) { if (version_compare("5.4.6", PHP_VERSION, ">")) {
assert('is_string($dir) && strlen($dir) > 0 /* $dir does not look like an actual folder name */'); assert('is_string($dir) && strlen($dir) > 0 /* $dir does not look like an actual folder name */');
} else { } else {
assert('is_string($dir) && strlen($dir) > 0', 'Value "' . $dir .'" does not look like an actual folder name'); assert((is_string($dir) && strlen($dir) > 0), 'Value "' . $dir .'" does not look like an actual folder name');
} }
$dir = trim($dir); $dir = trim($dir);

View File

@@ -16,7 +16,7 @@
*/ */
// Main version variable // Main version variable
$version = '0.9.40'; $version = '0.9.40.1';
// Database version (YYYYMMDDC where C is a daily counter) // Database version (YYYYMMDDC where C is a daily counter)
$dbversion = '201809280'; $dbversion = '201809280';