Skip to content

Commit

Permalink
Merge pull request #165 from PrestaSafe/fix-update-html-field
Browse files Browse the repository at this point in the history
Fix update html field
  • Loading branch information
PrestaSafe authored Nov 17, 2023
2 parents 415ca86 + 0d7d62f commit a6ac05e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions _dev/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { createApp } from 'vue'
import App from './App.vue'
import { createPinia } from 'pinia'
const pinia = createPinia()
// global css
import './index.css'
const app = createApp(App).use(pinia)
app.mount('#app')


createApp(App).use(pinia).mount('#app')
window.vueInstance = app
2 changes: 1 addition & 1 deletion classes/PrettyBlocksModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ public function updateConfig($stateRequest)
$existingConfig = json_decode($this->config, true);
$newConfig = json_decode($this->generateJsonConfig(), true);
$mergedConfig = array_merge($existingConfig, $newConfig);
$this->config = json_encode($mergedConfig);
$this->config = json_encode($mergedConfig, true);
$template_name = pSQL($stateRequest['templateSelected']);
$this->setCurrentTemplate($template_name);
$this->setDefaultParams($stateRequest['default']);
Expand Down
2 changes: 1 addition & 1 deletion prettyblocks.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function __construct()
{
$this->name = 'prettyblocks';
$this->tab = 'administration';
$this->version = '3.0.2';
$this->version = '3.0.3';
$this->author = 'PrestaSafe';
$this->need_instance = 1;
$this->js_path = $this->_path . 'views/js/';
Expand Down

0 comments on commit a6ac05e

Please sign in to comment.