aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2006-07-03 22:58:19 +0000
committerplegall <plg@piwigo.org>2006-07-03 22:58:19 +0000
commit2b6c63cccf64fda613127ef0410aeaccad67657b (patch)
tree45eefa2d5a93af7523d06649559bb224d9caa622
parent4ce94a5eabae23a48bdd889aebefd26ddea51f1f (diff)
merge -r1428:1429 from branch 1.6 to trunk (bug fixed: check of non
emptiness on $_SERVER['PATH_INFO']) git-svn-id: http://piwigo.org/svn/trunk@1430 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/functions_session.inc.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/functions_session.inc.php b/include/functions_session.inc.php
index 48271af6e..9768bf927 100644
--- a/include/functions_session.inc.php
+++ b/include/functions_session.inc.php
@@ -87,7 +87,7 @@ function cookie_path()
if ( isset($_SERVER['REDIRECT_URL']) )
{ // mod_rewrite is activated for upper level directories. we must set the
// cookie to the path shown in the browser otherwise it will be discarded.
- if ( isset($_SERVER['PATH_INFO']) )
+ if ( isset($_SERVER['PATH_INFO']) and !empty($_SERVER['PATH_INFO']) )
{
$idx = strpos( $_SERVER['REDIRECT_URL'], $_SERVER['PATH_INFO'] );
if ($idx !== false)