From: Iain Patterson <me@iain.cx>
Date: Thu, 7 Apr 2016 15:49:15 +0000 (-0400)
Subject: Merge branch 'master' into uat
X-Git-Tag: live-2016-04-07^0
X-Git-Url: http://git.iain.cx/?p=readifood.git;a=commitdiff_plain;h=21262249a0908a834f5f1f8ffa70ef8988879775;hp=44602fdbde624186066be0f824e97c822679bc01

Merge branch 'master' into uat
---

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);