composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source
This commit is contained in:
Eric Espie
2022-09-05 12:14:57 +02:00
parent 2b84c0384d 57bb0160c4
commit 7621a0fd31
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
datamodels/2.x/itop-structure/datamodel.itop-structure.xml
View File

@@ -1896,4 +1896,5 @@
<profiles>
</profiles>
</user_rights>
<constants/>
</itop_design>

14
sources/Application/Helper/Session.php
View File

@@ -25,16 +25,18 @@ class Session
public static function Start()
{
if (!self::$bIsInitialized) {
session_name('itop-'.md5(APPROOT));
}
self::$bIsInitialized = true;
if (!self::$bSessionStarted) {
session_name('itop-'.md5(APPROOT));
if (!is_null(self::$iSessionId)) {
session_id(self::$iSessionId);
self::$bSessionStarted = session_start();
} else {
self::$bSessionStarted = session_start();
self::$iSessionId = session_id();
if (session_id(self::$iSessionId) === false) {
session_regenerate_id();
}
}
self::$bSessionStarted = session_start();
self::$iSessionId = session_id();
}
}