From: Evan Prodromou <evan@status.net>
Date: Mon, 3 Oct 2011 13:32:24 +0000 (-0400)
Subject: Merge branch 'master' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d852e871f53bee25762e4909d3a07309b390e043;hp=2930484d4f2a7b33a17ddd755499d270fe699329;p=quix0rs-gnu-social.git

Merge branch 'master' into 1.0.x
---

diff --git a/index.php b/index.php
index 850208c9d1..1566399fa2 100644
--- a/index.php
+++ b/index.php
@@ -49,21 +49,29 @@ $action = null;
 
 function getPath($req)
 {
+    $p = null;
+
     if ((common_config('site', 'fancy') || !array_key_exists('PATH_INFO', $_SERVER))
         && array_key_exists('p', $req)
     ) {
-        return $req['p'];
+        $p = $req['p'];
     } else if (array_key_exists('PATH_INFO', $_SERVER)) {
         $path = $_SERVER['PATH_INFO'];
         $script = $_SERVER['SCRIPT_NAME'];
         if (substr($path, 0, mb_strlen($script)) == $script) {
-            return substr($path, mb_strlen($script));
+            $p = substr($path, mb_strlen($script) + 1);
         } else {
-            return $path;
+            $p = $path;
         }
     } else {
-        return null;
+        $p = null;
     }
+
+    // Trim all initial '/'
+
+    $p = ltrim($p, '/');
+
+    return $p;
 }
 
 /**