Follow up to r3226

[isaiahdw]

Router::$query_string should match $_GET when using the alternative "index.php?/$0" .htaccess method.

I fixed this by adding the following to the setup function (right after $query_string is set).

// Remove the URI from Router::$query_string if it's there
self::$query_string = str_replace(array('?/'.self::$current_uri.'/&', '?/'.self::$current_uri.'&'), array('/?', '?'), self::$query_string);

This removes the current uri from $query_string if it's there. It also works for both "example/?test=test" and "example?test=test" urls.

[Shadowhand]

Fixed in r3256.