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

fix bug in updater which prevents the updater to finish correctly, fixes #1186

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-04-12 09:56:02 +02:00
parent 9af43854d9
commit e9f3e617c7
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/froxlor.sql
View File

@@ -534,7 +534,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('panel', 'password_regex', ''), ('panel', 'password_regex', ''),
('panel', 'use_webfonts', '0'), ('panel', 'use_webfonts', '0'),
('panel', 'webfont', 'Numans'), ('panel', 'webfont', 'Numans'),
('panel', 'version', '0.9.28'); ('panel', 'version', '0.9.28.1');

6
install/updates/froxlor/0.9/update_0.9.inc.php
View File

@@ -2046,3 +2046,9 @@ if (isFroxlorVersion('0.9.28-rc2')) {
updateToVersion('0.9.28'); updateToVersion('0.9.28');
} }
if (isFroxlorVersion('0.9.28')) {
showUpdateStep("Updating from 0.9.28 final to 0.9.28.1");
lastStepStatus(0);
updateToVersion('0.9.28.1');
}

4
install/updates/preconfig/0.9/preconfig_0.9.inc.php
View File

@@ -491,8 +491,8 @@ LoadModule authz_host_module modules/mod_authz_host.so</pre><br />';
$description = 'Froxlor changed the default parameter-set of sendmail (php.ini)<br />'; $description = 'Froxlor changed the default parameter-set of sendmail (php.ini)<br />';
$description .= 'sendmail_path = "/usr/sbin/sendmail -t <strong>-i</strong> -f {CUSTOMER_EMAIL}"<br /><br />'; $description .= 'sendmail_path = "/usr/sbin/sendmail -t <strong>-i</strong> -f {CUSTOMER_EMAIL}"<br /><br />';
$description .= 'If you don\'t have any problems with sending mails, you don\'t need to change this'; $description .= 'If you don\'t have any problems with sending mails, you don\'t need to change this';
if ($this->_settings['system']['mod_fcgid'] == '1' if ($settings['system']['mod_fcgid'] == '1'
|| $this->_settings['phpfpm']['enabled'] == '1' || $settings['phpfpm']['enabled'] == '1'
) { ) {
// information about removal of php's safe_mode // information about removal of php's safe_mode
$description .= '<br /><br />The php safe_mode flag has been removed as current versions of PHP<br />'; $description .= '<br /><br />The php safe_mode flag has been removed as current versions of PHP<br />';

2
lib/tables.inc.php
View File

@@ -73,6 +73,6 @@ define('PACKAGE_ENABLED', 2);
// VERSION INFO // VERSION INFO
$version = '0.9.28'; $version = '0.9.28.1';
$dbversion = '2'; $dbversion = '2';
$branding = ''; $branding = '';