From 240292e5a7b9ed9ead1b88bc169ad3aeb15900d6 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 30 Jan 2008 00:18:05 +0000 Subject: fixed bug (#3284) where the $rsegment array would not be set properly if the requested URI contained more segments than the routed URI. --- system/libraries/URI.php | 5 +++-- user_guide/changelog.html | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/system/libraries/URI.php b/system/libraries/URI.php index 6c8eb2e23..8de26f933 100644 --- a/system/libraries/URI.php +++ b/system/libraries/URI.php @@ -246,8 +246,9 @@ class CI_URI { function _reindex_segments() { // Is the routed segment array different then the main segment array? - $diff = (count(array_diff($this->rsegments, $this->segments)) == 0) ? FALSE : TRUE; - + // have to compute the diff both ways since PHP returns only values in $arr1 that are not in $arr2. + $diff = (array_diff($this->rsegments, $this->segments) != array_diff($this->segments, $this->rsegments)) ? TRUE : FALSE; + $i = 1; foreach ($this->segments as $val) { diff --git a/user_guide/changelog.html b/user_guide/changelog.html index b6125b7e1..dc3ddf34c 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -164,9 +164,10 @@ Change Log
  • Removed an extraneous call to loading models (#3286).
  • Removed extraneous load of $CFG in _display_cache() of the Output class (#3285).
  • Removed an unused parameter from Profiler (#3332).
    • +
  • Fixed a bug (#3284) where the rsegment array would not be set properly if the requested URI contained more segments than the routed URI.
  • Fixed a bug (#3314) which would cause the top level path to be deleted in delete_files() of the File helper.
  • Fixed a bug (#2858) which referenced a wrong variable in the Image class.
    • -
  • Fixed a bug (#3024) in which master_dim wasn't gettitng reset by clear() in the Image library.
    • +
  • Fixed a bug (#3024) in which master_dim wasn't getting reset by clear() in the Image library.
  • Fixed a bug (#3330) in the FTP class where a comparison wasn't getting made.
  • Fixed a bug (#3328) where the smiley helper might return an undefined variable.
  • Fixed a bug (#3310) with sanitization of globals in the Input class that could unset CI's global variables.
    • -- cgit v1.2.3-24-g4f1b