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

Merge remote-tracking branch 'origin/0.9.31.1'

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-22 19:21:34 +01:00
parent d831d06da9 261d6e7d76
commit 99c0bda7f2
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actions/admin/settings/210.security.php
View File

@@ -53,7 +53,7 @@ return array(
'settinggroup' => 'system', 'settinggroup' => 'system',
'varname' => 'allow_error_report_admin', 'varname' => 'allow_error_report_admin',
'type' => 'bool', 'type' => 'bool',
'default' => true, // TODO: will be false in final release 'default' => false,
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingField',
), ),
'system_allow_error_report_customer' => array( 'system_allow_error_report_customer' => array(

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

@@ -2645,3 +2645,9 @@ if (isFroxlorVersion('0.9.32-dev1')) {
updateToVersion('0.9.32-dev2'); updateToVersion('0.9.32-dev2');
} }
if (isFroxlorVersion('0.9.31')) {
showUpdateStep("Updating from 0.9.31 to 0.9.31.1 final", true);
lastStepStatus(0);
updateToVersion('0.9.31.1');
}