Merge branch 'master' into develop

# Conflicts: # _xtense.php # update.php
darknoon29 · Feb 12, 2020 · 5ea452c · 5ea452c
2 parents c8f27ad + 6bb537b
commit 5ea452c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/install.php b/install.php
@@ -46,11 +46,11 @@
 $db->sql_query($query);
 
 // on insère les valeurs de configuration par défaut
-$sqldata = '{"transp":75,"layer":1,"defenseur":1,"histo":1}';
+$sqldata = '{\"transp\":75,\"layer\":1,\"defenseur\":1,\"histo\":1}';
 mod_set_option('config', $sqldata);
 
 // on insère les valeurs bbcodes par défaut
-$sqldata = '{"title":"#FFA500","m_g":"#00FF40","c_g":"#00FF40","d_g":"#00FF40","m_r":"#00FF40","c_r":"#00FF40","perte":"#FF0000","renta":"#00FF40"}';
+$sqldata = '{\"title\":\"#FFA500\",\"m_g\":\"#00FF40\",\"c_g\":\"#00FF40\",\"d_g\":\"#00FF40\",\"m_r\":\"#00FF40\",\"c_r\":\"#00FF40\",\"perte\":\"#FF0000\",\"renta\":\"#00FF40\"}';
 mod_set_option('bbcodes', $sqldata);
 
 //On vérifie que la table xtense_callbacks existe (Xtense2)