From 7fffb0960436ff0cc2b1fb3642f7400e015244db Mon Sep 17 00:00:00 2001 From: Iain Patterson Date: Thu, 7 Apr 2016 11:47:21 -0400 Subject: [PATCH] Sometimes SCRIPT_URL isn't available. If not running in a virtualhost context, Apache may expose REDIRECT_URL instead. --- www/index.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/index.php b/www/index.php index e181d08..f8434a9 100644 --- a/www/index.php +++ b/www/index.php @@ -13,7 +13,8 @@ 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['SCRIPT_URL']); + $script_url = array_key_exists('SCRIPT_URL', $_SERVER) ? $_SERVER['SCRIPT_URL'] : $_SERVER['REDIRECT_URL']; + $request = preg_replace('!^/branches/[^/]+/!', "", $script_url); $request = preg_replace('!^/+!', "", $request); $request = preg_replace('!/+$!', "", $request); -- 2.7.4