aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinteck <contact@minteck.org>2022-06-04 15:16:22 +0200
committerMinteck <contact@minteck.org>2022-06-04 15:16:22 +0200
commit2c72a4992f6fd1d97513fb9fdac9f55a7d0a0be3 (patch)
tree49ae7fa453c2df796230a89480a6b805d4faf2be
parent8ecd875035433835c03d74ff60da47282a8e3606 (diff)
downloadcore-2c72a4992f6fd1d97513fb9fdac9f55a7d0a0be3.tar.gz
core-2c72a4992f6fd1d97513fb9fdac9f55a7d0a0be3.tar.bz2
core-2c72a4992f6fd1d97513fb9fdac9f55a7d0a0be3.zip
Fix
-rw-r--r--.idea/workspace.xml8
-rw-r--r--app/intro/session.php2
2 files changed, 5 insertions, 5 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ee488f0..751fa53 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,6 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e4941d36-f387-4fd6-8e3d-4cad435f2034" name="Changes" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/cdn/statusbar.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/statusbar.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/genealogy/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/genealogy/.gitlab-ci.yml" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/.gitlab-ci.yml" afterDir="false" />
@@ -61,8 +62,7 @@
<change beforePath="$PROJECT_DIR$/app/genealogy/styles/dark.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/styles/dark.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/genealogy/tree/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/tree/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/genealogy/tree/mktree.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/tree/mktree.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/version.txt" beforeDir="false" afterPath="$PROJECT_DIR$/version.txt" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/intro/session.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/intro/session.php" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -82,7 +82,7 @@
</option>
</component>
<component name="Git.Settings">
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/app/cdn" />
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/app/intro" />
</component>
<component name="GitSEFilterConfiguration">
<file-type-list>
@@ -167,7 +167,7 @@
<workItem from="1650805734182" duration="1344000" />
<workItem from="1653663350526" duration="616000" />
<workItem from="1654000587101" duration="441000" />
- <workItem from="1654345612131" duration="1429000" />
+ <workItem from="1654345612131" duration="2127000" />
</task>
<servers />
</component>
diff --git a/app/intro/session.php b/app/intro/session.php
index 9d7ce99..50468b7 100644
--- a/app/intro/session.php
+++ b/app/intro/session.php
@@ -52,7 +52,7 @@ if (isset($_COOKIE['FL_SESSION_TOKEN'])) {
$_USER = $_PROFILE['login'];
$_SUID = $_PROFILE['login'];
$_FULLNAME = $_PROFILE['name'];
- $_FRENCH = $_PROFILE['locale']['name'] === "fr";
+ $_FRENCH = $_PROFILE['profile']['locale']['name'] === "fr";
$loggedIn = true;
if (!in_array($_USER, $_WELCOMED)) {