Merge pull request #16419 from civicrm/5.22

[civicrm-core.git] / CRM / Core / Session.php

diff --git a/CRM/Core/Session.php b/CRM/Core/Session.php
index 75936e7f94127d7d6e3e73f743f7dbc86d72431c..8cbcfdfeada0d42acd5969301bd5eac19e54f1bf 100644 (file)
--- a/CRM/Core/Session.php
+++ b/CRM/Core/Session.php
@@ -108,17 +108,7 @@ class CRM_Core_Session {
         if ($isRead) {
           return;
         }
-        // FIXME: This belongs in CRM_Utils_System_*
-        if (CRM_Core_Config::singleton()->userSystem->is_drupal && function_exists('drupal_session_start')) {
-          // https://issues.civicrm.org/jira/browse/CRM-14356
-          if (!(isset($GLOBALS['lazy_session']) && $GLOBALS['lazy_session'] == TRUE)) {
-            drupal_session_start();
-          }
-          $_SESSION = [];
-        }
-        else {
-          session_start();
-        }
+        CRM_Core_Config::singleton()->userSystem->sessionStart();
       }
       $this->_session =& $_SESSION;
     }