Merge remote-tracking branch 'origin/MinzSessionCookie' into dev

1 files changed, 3 insertions, 4 deletions

diff --git a/lib/Minz/Session.php b/lib/Minz/Session.php
index 058685ada..14a093bf7 100644
--- a/lib/Minz/Session.php
+++ b/lib/Minz/Session.php
@@ -65,10 +65,9 @@ class Minz_Session {
 	 * @param $l la durée de vie
 	 */
 	public static function keepCookie($l) {
-		// Get the script_name (e.g. /p/i/index.php) and keep only the path.
-		$cookie_dir = empty($_SERVER['SCRIPT_NAME']) ? '' : $_SERVER['SCRIPT_NAME'];
-		$cookie_dir = dirname($cookie_dir);
-		session_set_cookie_params($l, $cookie_dir, '', false, true);
+			// Get the script_name (e.g. /p/i/index.php) and keep only the path.
+			$cookie_dir = dirname(empty($_SERVER['REQUEST_URI']) ? '/' : dirname($_SERVER['REQUEST_URI']));
+			session_set_cookie_params($l, $cookie_dir, '', false, false);
 	}