aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2006-05-09 00:29:59 +0000
committerrvelices <rv-github@modusoptimus.com>2006-05-09 00:29:59 +0000
commitf231c5fd003545299b03d63445afa3f77665083e (patch)
tree2d768725500f130bafb1d31cc0e9fa69ff88e68a
parent486aa9f4ad5d55caf376ca213fad1778e31e5bad (diff)
merge -r1305 from branch-1_6 to trunk
fix: URLs not working with some ISPs that set _SERVER['PATH_INFO'] in a non standard way git-svn-id: http://piwigo.org/svn/trunk@1306 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/section_init.inc.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/section_init.inc.php b/include/section_init.inc.php
index 1d5949e63..806679e02 100644
--- a/include/section_init.inc.php
+++ b/include/section_init.inc.php
@@ -53,7 +53,10 @@
$page['section'] = 'categories';
-if ( isset($_SERVER["PATH_INFO"]) and !empty($_SERVER["PATH_INFO"]) )
+// some ISPs set PATH_INFO to empty string or to SCRIPT_FILENAME while in the
+// default apache implementation it is not set
+if ( $conf['question_mark_in_urls']==false and
+ isset($_SERVER["PATH_INFO"]) and !empty($_SERVER["PATH_INFO"]) )
{
$rewritten = $_SERVER["PATH_INFO"];
$rewritten = str_replace('//', '/', $rewritten);