From 30e6e38d7a94d7530c688ff099d0974615f9c0c5 Mon Sep 17 00:00:00 2001 From: milkamil93 Date: Fri, 22 May 2020 15:51:39 +0500 Subject: [PATCH] Fix for ClientSettings set default storage --- assets/plugins/multifields/core/MultiFields.php | 2 +- assets/tvs/multifields/multifields.customtv.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/plugins/multifields/core/MultiFields.php b/assets/plugins/multifields/core/MultiFields.php index 09f9034..f61355e 100644 --- a/assets/plugins/multifields/core/MultiFields.php +++ b/assets/plugins/multifields/core/MultiFields.php @@ -102,7 +102,7 @@ public function renderData() 'docid' => $this->params['id'], 'tvId' => $this->params['tv']['id'], 'tvName' => $this->params['tv']['name'], - 'fieldname' => $this->params['storage'] == 'default' ? (is_numeric($this->params['tv']['id']) ? 'tv' . $this->params['tv']['id'] : $this->params['tv']['id']) : 'mf-data[' . $this->params['id'] . '__' . $this->params['tv']['id'] . ']', + 'fieldname' => $this->params['storage'] == 'default' ? 'tv' . $this->params['tv']['id'] : 'mf-data[' . $this->params['id'] . '__' . $this->params['tv']['id'] . ']', 'value' => $this->params['storage'] == 'default' ? (!empty($this->params['tv']['value']) ? $this->params['tv']['value'] : '') : (!empty($this->data) ? stripcslashes(json_encode($this->data, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)) : '') ]; $data['toolbar'] = $this->getToolbar($data); diff --git a/assets/tvs/multifields/multifields.customtv.php b/assets/tvs/multifields/multifields.customtv.php index 4225074..3154440 100644 --- a/assets/tvs/multifields/multifields.customtv.php +++ b/assets/tvs/multifields/multifields.customtv.php @@ -10,4 +10,4 @@ require_once dirname(dirname(__DIR__)) . '/plugins/multifields/core/MultiFields.php'; -echo \MF2\MultiFields::getInstance($content['id'], $row)->renderData(); +echo \MF2\MultiFields::getInstance(isset($content['id']) ? $content['id'] : 0, $row)->renderData();