From 359336243c4f2aa3b1dceaee91ce723edec6472e Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 23 Jan 2015 16:04:45 +0100 Subject: [PATCH] Save "none" instead of "null" when choosing to not to store preferences refs #8234 --- application/forms/Config/General/ApplicationConfigForm.php | 2 +- modules/setup/application/forms/PreferencesPage.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php index f59454ff3..29b7b512e 100644 --- a/application/forms/Config/General/ApplicationConfigForm.php +++ b/application/forms/Config/General/ApplicationConfigForm.php @@ -52,7 +52,7 @@ class ApplicationConfigForm extends Form 'multiOptions' => array( 'ini' => $this->translate('File System (INI Files)'), 'db' => $this->translate('Database'), - 'null' => $this->translate('Don\'t Store Preferences') + 'none' => $this->translate('Don\'t Store Preferences') ) ) ); diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php index 83f036498..211d16fac 100644 --- a/modules/setup/application/forms/PreferencesPage.php +++ b/modules/setup/application/forms/PreferencesPage.php @@ -66,7 +66,7 @@ class PreferencesPage extends Form if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) { $storageTypes['db'] = $this->translate('Database'); } - $storageTypes['null'] = $this->translate('Don\'t Store Preferences'); + $storageTypes['none'] = $this->translate('Don\'t Store Preferences'); $this->addElement( 'select',