Merge remote branch 'statusnet/0.8.x' into 0.9.x

Conflicts:
	EVENTS.txt
	actions/requesttoken.php
	classes/File.php
	install.php
	lib/action.php
	lib/noticeform.php

1 files changed, 7 insertions, 1 deletions

diff --git a/index.php b/index.php
index 8ff67d19d..51e30f578 100644
--- a/index.php
+++ b/index.php
@@ -49,7 +49,13 @@ function getPath($req)
     ) {
         return $req['p'];
     } else if (array_key_exists('PATH_INFO', $_SERVER)) {
-        return $_SERVER['PATH_INFO'];
+        $path = $_SERVER['PATH_INFO'];
+        $script = $_SERVER['SCRIPT_NAME'];
+        if (substr($path, 0, mb_strlen($script)) == $script) {
+            return substr($path, mb_strlen($script));
+        } else {
+            return $path;
+        }
     } else {
         return null;
     }