Author: fabien
Date: 2010-04-01 16:29:26 +0200 (Thu, 01 Apr 2010)
New Revision: 28962
Modified:
branches/1.3/lib/request/sfWebRequest.class.php
branches/1.4/lib/request/sfWebRequest.class.php
Log:
[1.3, 1.4] fixed a warning on lighttpd (closes #8417)
Modified: branches/1.3/lib/request/sfWebRequest.class.php
===================================================================
--- branches/1.3/lib/request/sfWebRequest.class.php 2010-04-01 14:17:52 UTC
(rev 28961)
+++ branches/1.3/lib/request/sfWebRequest.class.php 2010-04-01 14:29:26 UTC
(rev 28962)
@@ -248,13 +248,14 @@
{
if (isset($pathArray['REQUEST_URI']))
{
+ $qs = isset($pathArray['QUERY_STRING']) ? $pathArray['QUERY_STRING'] :
'';
$script_name = $this->getScriptName();
$uri_prefix = $this->isAbsUri() ? $this->getUriPrefix() : '';
$pathInfo = preg_replace('/^'.preg_quote($uri_prefix,
'/').'/','',$pathArray['REQUEST_URI']);
$pathInfo = preg_replace('/^'.preg_quote($script_name, '/').'/', '',
$pathInfo);
$prefix_name = preg_replace('#/[^/]+$#', '', $script_name);
$pathInfo = preg_replace('/^'.preg_quote($prefix_name, '/').'/', '',
$pathInfo);
- $pathInfo = preg_replace('/\??'.preg_quote($pathArray['QUERY_STRING'],
'/').'$/', '', $pathInfo);
+ $pathInfo = preg_replace('/\??'.preg_quote($qs, '/').'$/', '',
$pathInfo);
}
}
else
Modified: branches/1.4/lib/request/sfWebRequest.class.php
===================================================================
--- branches/1.4/lib/request/sfWebRequest.class.php 2010-04-01 14:17:52 UTC
(rev 28961)
+++ branches/1.4/lib/request/sfWebRequest.class.php 2010-04-01 14:29:26 UTC
(rev 28962)
@@ -248,13 +248,14 @@
{
if (isset($pathArray['REQUEST_URI']))
{
+ $qs = isset($pathArray['QUERY_STRING']) ? $pathArray['QUERY_STRING'] :
'';
$script_name = $this->getScriptName();
$uri_prefix = $this->isAbsUri() ? $this->getUriPrefix() : '';
$pathInfo = preg_replace('/^'.preg_quote($uri_prefix,
'/').'/','',$pathArray['REQUEST_URI']);
$pathInfo = preg_replace('/^'.preg_quote($script_name, '/').'/', '',
$pathInfo);
$prefix_name = preg_replace('#/[^/]+$#', '', $script_name);
$pathInfo = preg_replace('/^'.preg_quote($prefix_name, '/').'/', '',
$pathInfo);
- $pathInfo = preg_replace('/\??'.preg_quote($pathArray['QUERY_STRING'],
'/').'$/', '', $pathInfo);
+ $pathInfo = preg_replace('/\??'.preg_quote($qs, '/').'$/', '',
$pathInfo);
}
}
else
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
