Skip to content

Commit

Permalink
fixed #3983
Browse files Browse the repository at this point in the history
  • Loading branch information
Guite committed Nov 18, 2019
1 parent 48832f1 commit 14e4d19
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG-2.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CHANGELOG - ZIKULA 2.0.x
- Fixes:
- Prevent exception caused by invalid return URL during login.
- Updated listener priorities in Settings module to fix non-working variable localisation (#3934).
- Fixed regression in settings page (#3983).


2.0.14 (2019-11-13)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -450,13 +450,13 @@ public function purifierconfigAction(Request $request, $reset = null)

// Editing for only these types is supported
$editableTypes = [
HTMLPurifier_VarParser::STRING,
HTMLPurifier_VarParser::C_STRING,
HTMLPurifier_VarParser::ISTRING,
HTMLPurifier_VarParser::TEXT,
HTMLPurifier_VarParser::ITEXT,
HTMLPurifier_VarParser::INT,
HTMLPurifier_VarParser::FLOAT,
HTMLPurifier_VarParser::BOOL,
HTMLPurifier_VarParser::C_INT,
HTMLPurifier_VarParser::C_FLOAT,
HTMLPurifier_VarParser::C_BOOL,
HTMLPurifier_VarParser::LOOKUP,
HTMLPurifier_VarParser::ALIST,
HTMLPurifier_VarParser::HASH
Expand Down
4 changes: 3 additions & 1 deletion src/system/SettingsModule/Controller/SettingsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,10 @@ public function mainAction(Request $request)
$profileModules = $this->get('zikula_users_module.internal.profile_module_collector')->getKeys();
$messageModules = $this->get('zikula_users_module.internal.message_module_collector')->getKeys();

$variables = $this->getSystemVars();
$variables['UseCompression'] = (bool)$variables['UseCompression'];
$form = $this->createForm(MainSettingsType::class,
$this->getSystemVars(),
$variables,
[
'translator' => $this->get('translator.default'),
'languages' => $installedLanguageNames,
Expand Down

0 comments on commit 14e4d19

Please sign in to comment.