diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2008-05-07 18:40:28 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2008-05-07 18:40:28 +0200 |
| commit | 62a90205c4ace42df775dbe1354c41340e89c92c (patch) | |
| tree | a3e77a8721ff9e8e2d570d58ddb2226e763aad43 | |
| parent | 55bc1a81545b3d8cc854a2eb77018ff1c54cec23 (diff) | |
removed SCRIPT_NAME from path provided by ORIG_PATH_INFO to remove the path and script name from the URI data
(bug #3191)
| -rw-r--r-- | system/libraries/URI.php | 3 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/system/libraries/URI.php b/system/libraries/URI.php index f0d02101a..8ee888a2e 100644 --- a/system/libraries/URI.php +++ b/system/libraries/URI.php @@ -92,7 +92,8 @@ class CI_URI { $path = (isset($_SERVER['ORIG_PATH_INFO'])) ? $_SERVER['ORIG_PATH_INFO'] : @getenv('ORIG_PATH_INFO');
if (trim($path, '/') != '' AND $path != "/".SELF)
{
- $this->uri_string = $path;
+ // remove path and script information so we have good URI data
+ $this->uri_string = str_replace($_SERVER['SCRIPT_NAME'], '', $path);
return;
}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 51f594f23..6401b9e74 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -109,6 +109,7 @@ SVN Commit: not currently released</p> <h3>Bugfixes for 1.6.2</h3>
<ul>
+ <li>Fixed a bug (#3191) with ORIG_PATH_INFO URI parsing.</li>
<li>Fixed assorted user guide typos (#3453, #4364, #4379, #4399, #4408, #4412, #4448, #4488).</li>
<li>Fixed an incorrect documentation of $this->load->language (#3520).</li>
<li>Fixed an AR_caching error where it wasn't tracking table aliases (#3463).</li>
|