diff --git a/README.md b/README.md index 588304e54b..69081929ce 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ -# SuiteCRM 8.4.0 +# SuiteCRM 8.4.1 [![LICENSE](https://img.shields.io/github/license/suitecrm/suitecrm.svg)](https://github.com/salesagility/suitecrm/blob/hotfix/LICENSE.txt) [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/salesagility/SuiteCRM-Core/issues) diff --git a/VERSION b/VERSION index a2f28f43be..6da4de57dc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.4.0 +8.4.1 diff --git a/core/app/common/package.json b/core/app/common/package.json index f54700d5de..247a68c6a5 100644 --- a/core/app/common/package.json +++ b/core/app/common/package.json @@ -1,6 +1,6 @@ { "name": "common", - "version": "8.4.0", + "version": "8.4.1", "peerDependencies": { "@angular/common": "^12.1.0", "@angular/core": "^12.1.0", diff --git a/core/app/core/package.json b/core/app/core/package.json index 2f6186ddad..f2d5ee4095 100644 --- a/core/app/core/package.json +++ b/core/app/core/package.json @@ -1,6 +1,6 @@ { "name": "core", - "version": "8.4.0", + "version": "8.4.1", "peerDependencies": { "@angular/common": "^12.1.0", "@angular/core": "^12.1.0", diff --git a/package.json b/package.json index 8ab8b199bb..eccd2b1ab9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "suitecrm", - "version": "8.4.0", + "version": "8.4.1", "scripts": { "ng": "ng", "start": "npm run start:shell", diff --git a/public/legacy/data/SugarBean.php b/public/legacy/data/SugarBean.php index 9556bd9445..1302a11bac 100755 --- a/public/legacy/data/SugarBean.php +++ b/public/legacy/data/SugarBean.php @@ -2623,12 +2623,12 @@ public function cleanBean() } if (isset($def['type']) && ($def['type'] == 'html' || $def['type'] == 'longhtml')) { - $this->$key = htmlentities((string) SugarCleaner::cleanHtml($this->$key, true)); + $this->$key = purify_html($this->$key); } elseif ( (strpos((string) $type, 'char') !== false || strpos((string) $type, 'text') !== false || $type == 'enum') && !empty($this->$key) ) { - $this->$key = htmlentities((string) SugarCleaner::cleanHtml($this->$key, true)); + $this->$key = purify_html($this->$key); } } } diff --git a/public/legacy/include/utils.php b/public/legacy/include/utils.php index 7fdf6ee0c9..9ab2e5d4f3 100755 --- a/public/legacy/include/utils.php +++ b/public/legacy/include/utils.php @@ -2802,7 +2802,9 @@ function purify_html(?string $value): string { $cleanedValue = ''; } - return $cleanedValue; + $doubleCleanedValue = htmlentities((string) SugarCleaner::cleanHtml($doubleDecoded, true)); + + return $doubleCleanedValue; } function preprocess_param($value) diff --git a/public/legacy/modules/ModuleBuilder/javascript/ModuleBuilder.js b/public/legacy/modules/ModuleBuilder/javascript/ModuleBuilder.js index bd9371e08a..7e5674db40 100755 --- a/public/legacy/modules/ModuleBuilder/javascript/ModuleBuilder.js +++ b/public/legacy/modules/ModuleBuilder/javascript/ModuleBuilder.js @@ -299,7 +299,7 @@ if (typeof('console') == 'undefined') { }); } var module_str = module; - if (typeof SUGAR.language.languages['app_list_strings']['moduleList'][module] != 'undefined') { + if (SUGAR.language.languages['app_list_strings'] && typeof SUGAR.language.languages['app_list_strings']['moduleList'][module] != 'undefined') { module_str = SUGAR.language.languages['app_list_strings']['moduleList'][module]; } ModuleBuilder.history.popup_window.setHeader(module_str + ' : ' + SUGAR.language.get('ModuleBuilder', 'LBL_' + layout.toUpperCase()) + SUGAR.language.get('ModuleBuilder', 'LBL_HISTORY_TITLE')); diff --git a/public/legacy/themes/suite8/css/suitep-base/editview.scss b/public/legacy/themes/suite8/css/suitep-base/editview.scss index 07664b6bb4..7994dc58ec 100644 --- a/public/legacy/themes/suite8/css/suitep-base/editview.scss +++ b/public/legacy/themes/suite8/css/suitep-base/editview.scss @@ -707,7 +707,7 @@ select { option:checked { font-weight: normal; - color: $main-font-color; + color: $main-font-color; background-color: $light-green !important; } @@ -3558,7 +3558,7 @@ select#sales_stage_advanced { } .col-sm-12 .col-sm-8.edit-view-field textarea { - width: 120%; + width: 100%; } [field=bool].col-sm-8.edit-view-field { @@ -3661,7 +3661,7 @@ select#sales_stage_advanced { } .col-sm-12 .col-sm-8.edit-view-field textarea { - width: 120%; + width: 100%; } [field=bool].col-sm-8.edit-view-field { @@ -3838,7 +3838,7 @@ select#sales_stage_advanced { } .col-sm-12 .col-sm-8.edit-view-field textarea#description { - width: 120%; + width: 100%; } #EditView_tabs .edit [type="checkbox"][name=alt_checkbox] { @@ -5763,4 +5763,4 @@ body.popupBody { background-size: 25px 11px; border-color: $bright-grey; } -} \ No newline at end of file +} diff --git a/public/legacy/themes/suite8/css/suitep-base/panels.scss b/public/legacy/themes/suite8/css/suitep-base/panels.scss index 000d226ad1..d1e45da163 100644 --- a/public/legacy/themes/suite8/css/suitep-base/panels.scss +++ b/public/legacy/themes/suite8/css/suitep-base/panels.scss @@ -355,8 +355,6 @@ div.sub-panel { .subpanel-table.list tr.pagination span.pageNumbers { position: relative; - /*top: 5px;*/ - bottom: 0.2em; } diff --git a/public/legacy/themes/suite8/css/suitep-base/studio.scss b/public/legacy/themes/suite8/css/suitep-base/studio.scss index 7c7278f863..9e6cddd19f 100644 --- a/public/legacy/themes/suite8/css/suitep-base/studio.scss +++ b/public/legacy/themes/suite8/css/suitep-base/studio.scss @@ -89,8 +89,9 @@ } #panels { - position: inherit; + position: absolute; padding: 5px; + margin-left: 200px; border: 1px solid $panel-default-border; border-radius: $border-radius-base; float: right;