diff --git a/core/model/schema/modx.action.fields.schema.xml b/core/model/schema/modx.action.fields.schema.xml index c9bd52ec43..4573992d8e 100644 --- a/core/model/schema/modx.action.fields.schema.xml +++ b/core/model/schema/modx.action.fields.schema.xml @@ -25,6 +25,8 @@ + + diff --git a/core/src/Revolution/modActionDom.php b/core/src/Revolution/modActionDom.php index 731239f297..38b79dae1c 100644 --- a/core/src/Revolution/modActionDom.php +++ b/core/src/Revolution/modActionDom.php @@ -39,10 +39,21 @@ public function apply($objId = '') $ruleType = $this->get('rule'); $container = json_encode($this->get('container')); - $itemId = json_encode($this->get('name')); + $itemId = $this->get('name'); + $value = $this->get('value'); + + /** Backward compat: Support for legacy tab ids for above/below content regions */ + foreach (['itemId', 'value'] as $identifier) { + $$identifier = in_array($$identifier, ['modx-content-above', 'modx-content-below']) + ? str_replace('modx-', 'modx-resource-', $$identifier) + : $$identifier + ; + } + + $itemId = json_encode($itemId); $value = in_array($ruleType, $boolRules) ? (int)$this->get('value') - : json_encode(htmlspecialchars($this->get('value'), ENT_COMPAT, $encoding)) + : json_encode(htmlspecialchars($value, ENT_COMPAT, $encoding)) ; switch ($ruleType) { diff --git a/manager/assets/modext/widgets/resource/modx.panel.resource.js b/manager/assets/modext/widgets/resource/modx.panel.resource.js index f596be17d0..20c400dbfb 100644 --- a/manager/assets/modext/widgets/resource/modx.panel.resource.js +++ b/manager/assets/modext/widgets/resource/modx.panel.resource.js @@ -1045,8 +1045,10 @@ Ext.extend(MODx.panel.Resource,MODx.FormPanel,{ ,autoHeight: true ,hideMode: 'offsets' ,items: [{ + id: 'modx-resource-content-above' + },{ + /** @deprecated To be removed in 3.3, reference new region id 'modx-resource-content-above' */ id: 'modx-content-above' - ,border: false },{ xtype: 'textarea' ,name: 'ta' @@ -1057,8 +1059,10 @@ Ext.extend(MODx.panel.Resource,MODx.FormPanel,{ ,grow: false ,value: (config.record.content || config.record.ta) || '' },{ + /** @deprecated To be removed in 3.3, reference new region id 'modx-resource-content-below' */ id: 'modx-content-below' - ,border: false + },{ + id: 'modx-resource-content-below' }] }; }