Browse Source

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

Alexandre Alapetite 12 years ago
parent
commit
301227a249
2 changed files with 2 additions and 2 deletions
  1. 1 1
      lib/Minz/Session.php
  2. 1 1
      p/i/install.php

+ 1 - 1
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)) {

+ 1 - 1
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'])) {