Merge pull request #338 from demeritcowboy/namespace

dev/drupal#169 - Fix namespacing in kcfinder
civicrm · Jan 9, 2022 · ac84a47 · ac84a47
2 parents 46e8efe + 091f1a9
commit ac84a47
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/kcfinder/core/class/browser.php b/kcfinder/core/class/browser.php
@@ -526,7 +526,7 @@ protected function act_downloadDir() {
             $this->errorMsg("Unknown error.");
         $filename = basename($dir) . ".zip";
         do {
-            $file = md5(time() . CRM_Core_Config::singleton()->userSystem->getSessionId());
+            $file = md5(time() . \CRM_Core_Config::singleton()->userSystem->getSessionId());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
         new zipFolder($file, $dir);
@@ -559,7 +559,7 @@ protected function act_downloadSelected() {
         }
 
         do {
-            $file = md5(time() . CRM_Core_Config::singleton()->userSystem->getSessionId());
+            $file = md5(time() . \CRM_Core_Config::singleton()->userSystem->getSessionId());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
 
@@ -601,7 +601,7 @@ protected function act_downloadClipboard() {
         }
 
         do {
-            $file = md5(time() . CRM_Core_Config::singleton()->userSystem->getSessionId());
+            $file = md5(time() . \CRM_Core_Config::singleton()->userSystem->getSessionId());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
 

diff --git a/kcfinder/core/class/uploader.php b/kcfinder/core/class/uploader.php
@@ -115,7 +115,7 @@ public function __construct() {
         require "conf/config.php";
 
         // SETTING UP SESSION
-        if (!CRM_Core_Config::singleton()->userSystem->getSessionId()) {
+        if (!\CRM_Core_Config::singleton()->userSystem->getSessionId()) {
             if (isset($_CONFIG['_sessionLifetime']))
                 ini_set('session.gc_maxlifetime', $_CONFIG['_sessionLifetime'] * 60);
             if (isset($_CONFIG['_sessionDir']))