diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2014-01-05 01:37:32 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2014-01-05 01:37:32 +0100 |
| commit | 301227a24987c5b925e3257e21f6486d9802b07e (patch) | |
| tree | 0228ba8295c916c13dac5d4d4c466dee145d7e3f | |
| parent | 3ede619dc8735561208b531f194127219008e66f (diff) | |
| parent | 0fa335308196e7bcdee91154f5ad26b35fb60b17 (diff) | |
Merge remote-tracking branch 'origin/dev' into beta
| -rw-r--r-- | lib/Minz/Session.php | 2 | ||||
| -rw-r--r-- | p/i/install.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Minz/Session.php b/lib/Minz/Session.php index 37faff0fb..ddabc4658 100644 --- a/lib/Minz/Session.php +++ b/lib/Minz/Session.php @@ -18,7 +18,7 @@ class Minz_Session { public static function init ($name) { // démarre la session session_name ($name); - session_set_cookie_params (0, './', null, false, true); + session_set_cookie_params (0, dirname(empty($_SERVER['REQUEST_URI']) ? '/' : dirname($_SERVER['REQUEST_URI'])), null, false, true); session_start (); if (isset ($_SESSION)) { diff --git a/p/i/install.php b/p/i/install.php index 0210133a5..85dfa3a66 100644 --- a/p/i/install.php +++ b/p/i/install.php @@ -3,7 +3,7 @@ require('../../constants.php'); include(LIB_PATH . '/lib_rss.php'); session_name('FreshRSS'); -session_set_cookie_params(0, './', null, false, true); +session_set_cookie_params(0, dirname(empty($_SERVER['REQUEST_URI']) ? '/' : dirname($_SERVER['REQUEST_URI'])), null, false, true); session_start(); if (isset ($_GET['step'])) { |