From 1a748a92f1782578b896c7dbfecb353587c49fe8 Mon Sep 17 00:00:00 2001 From: Iain Patterson Date: Mon, 4 Apr 2016 11:13:16 -0400 Subject: [PATCH] Fixed parsing parameters in rewrite. A rewritten URL which was passed a query parameter would be parsed incorrectly. For instance /contact/search/smith?page=2 would be treated as a search for a contact whose name was 'smith?page=2' rather than the second page of a search for the 'smith' contact. --- www/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/index.php b/www/index.php index 340401d..e181d08 100644 --- a/www/index.php +++ b/www/index.php @@ -13,7 +13,7 @@ Propel::init("$propel_root/build/conf/$propel_project-conf.php"); set_include_path(join(PATH_SEPARATOR, array(join(DIRECTORY_SEPARATOR, array($propel_root, "build", "classes")), get_include_path()))); - $request = preg_replace('!^/branches/[^/]+/!', "", $_SERVER['REQUEST_URI']); + $request = preg_replace('!^/branches/[^/]+/!', "", $_SERVER['SCRIPT_URL']); $request = preg_replace('!^/+!', "", $request); $request = preg_replace('!/+$!', "", $request); -- 2.20.1