Fixed issue #17790: KCFinder Image Browse Server not working due to i…

…ncorrect cookieDomain (#2176) Dev: this need to set it in config.
LimeSurvey · Dec 29, 2021 · c23fbfd · c23fbfd
1 parent f4d4c1b
commit c23fbfd
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/application/helpers/admin/htmleditor_helper.php b/application/helpers/admin/htmleditor_helper.php
@@ -27,8 +27,11 @@ function initKcfinder()
         'flash' => $sAllowedExtensions,
         'images' => $sAllowedExtensions
     );
-    if (Yii::app()->getRequest()->enableCsrfValidation && !empty(Yii::app()->getRequest()->csrfCookie->domain)) {
-        $_SESSION['KCFINDER']['cookieDomain'] = Yii::app()->getRequest()->csrfCookie->domain;
+    if (!empty(App()->getSession()->cookieParams['domain'])) {
+        $_SESSION['KCFINDER']['cookieDomain'] = App()->getSession()->cookieParams['domain'];
+    }
+    if (App()->getRequest()->enableCsrfValidation && !empty(App()->getRequest()->csrfCookie['domain'])) {
+        $_SESSION['KCFINDER']['cookieDomain'] = Yii::app()->getRequest()->csrfCookie['domain'];
     }
 
     if (