Merge remote-tracking branch 'upstream/develop' into sanitize-gcontact

[friendica.git] / src / App / BaseURL.php

diff --git a/src/App/BaseURL.php b/src/App/BaseURL.php
index 9d9a2711e9530e4ab12d40294ecc86fa6052989f..8d76a0d2d25d9dcaa519dc87a64f88907e2bc046 100644 (file)
--- a/src/App/BaseURL.php
+++ b/src/App/BaseURL.php
@@ -339,10 +339,10 @@ class BaseURL
                 * Not all of those $_SERVER properties can be present, so we do by inverse priority order
                 */
                $relative_script_path =
-                       ($this->server['REDIRECT_URL']        ?? '' ) ?:
-                       ($this->server['REDIRECT_URI']        ?? '' ) ?:
-                       ($this->server['REDIRECT_SCRIPT_URL'] ?? '' ) ?:
-                       ($this->server['SCRIPT_URL']          ?? '' ) ?:
+                       ($this->server['REDIRECT_URL']        ?? '') ?:
+                       ($this->server['REDIRECT_URI']        ?? '') ?:
+                       ($this->server['REDIRECT_SCRIPT_URL'] ?? '') ?:
+                       ($this->server['SCRIPT_URL']          ?? '') ?:
                         $this->server['REQUEST_URI']         ?? '';
 
                /* $relative_script_path gives /relative/path/to/friendica/module/parameter