ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 143 Activity

Merge branch '12300' into 12400

This commit is contained in:
Fred Tempez 2023-03-02 14:47:48 +01:00
parent 137d901078 adee18094b
commit 0449dd7936
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core.php
View File

@ -359,7 +359,7 @@ class common
// Stocker le cookie de langue pour l'éditeur de texte
setcookie('ZWII_UI', self::$i18nUI, time() + 3600, helper::baseUrl(false, false), '', helper::isHttps(), true);
setcookie('ZWII_UI', self::$i18nUI, time() + 3600, helper::baseUrl(false, false), '', false, false);
// Utilisateur connecté
if ($this->user === []) {

2
core/module/install/install.php
View File

@ -55,7 +55,7 @@ class install extends common
if ($this->isPost()) {
$lang = $this->getInput('installLanguage');
// Place le cookie pour la suite de l'installation
setcookie('ZWII_UI', $lang, time() + 3600, helper::baseUrl(false, false), '', helper::isHttps(), true);
setcookie('ZWII_UI', $lang, time() + 3600, helper::baseUrl(false, false), '', false, false);
// Valeurs en sortie
$this->addOutput([

3
core/vendor/tinymce/init.js vendored
View File

@ -10,7 +10,7 @@
if (typeof (privateKey) == 'undefined') {
var privateKey = null;
};
console.log(getCookie('ZWII_UI'));
tinymce.init({
// Classe où appliquer l'éditeur
selector: ".editorWysiwyg",
@ -331,6 +331,7 @@ function getCookie(name) {
for (var i = 0; i < ca.length; i++) {
var c = ca[i];
while (c.charAt(0) == ' ') c = c.substring(1, c.length);
if (c.indexOf(nameEQ) == 0) console.log(c.substring(nameEQ.length, c.length));
if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length, c.length);
}
return null;