Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix issue #122

  • Loading branch information...
commit 254735ee011d99f5c7fe3825849d7ec0b54bd4e1 1 parent d1097a1
@narfbg narfbg authored
Showing with 9 additions and 1 deletion.
  1. +8 −1 system/core/URI.php
  2. +1 −0  user_guide_src/source/changelog.rst
View
9 system/core/URI.php
@@ -696,7 +696,14 @@ public function uri_string()
*/
public function ruri_string()
{
- return implode('/', $this->rsegment_array());
+ global $RTR;
+
+ if (($dir = $RTR->fetch_directory()) === '/')
+ {
+ $dir = '';
+ }
+
+ return $dir.implode('/', $this->rsegment_array());
}
}
View
1  user_guide_src/source/changelog.rst
@@ -411,6 +411,7 @@ Bug fixes for 3.0
- Fixed a bug (#658) - :doc:`Routing <general/routing>` wildcard **:any** didn't work as advertised and matched multiple URI segments instead of all characters within a single segment.
- Fixed a bug (#1938) - :doc:`Email Library <libraries/email>` removed multiple spaces inside a pre-formatted plain text message.
- Fixed a bug (#388, #705) - :doc:`URI Library <libraries/uri>` didn't apply URL-decoding to URI segments that it got from **REQUEST_URI** and/or **QUERY_STRING**.
+- Fixed a bug (#122) - :doc:`URI Library <libraries/uri>` method ``ruri_string()`` didn't include a directory if one is used.
Version 2.1.3
=============
Please sign in to comment.
Something went wrong with that request. Please try again.