diff options
author | Lukas Reschke <lukas@owncloud.com> | 2016-04-26 13:18:18 +0200 |
---|---|---|
committer | Lukas Reschke <lukas@owncloud.com> | 2016-04-26 13:18:18 +0200 |
commit | df8b851f538a5571e21ca2bf7e3ad7464f3a01c5 (patch) | |
tree | 7bfd38ffba53ae4dc1001cc330017a081bb5b844 /lib | |
parent | 14c34919774484d095d26ad2a7246fc897dc2d41 (diff) | |
download | nextcloud-server-df8b851f538a5571e21ca2bf7e3ad7464f3a01c5.tar.gz nextcloud-server-df8b851f538a5571e21ca2bf7e3ad7464f3a01c5.zip |
Don't write empty RewriteBase
ownCloud may be configured to live at the root folder without a
trailing slash being specified. In this case manually set the
rewrite base to `/`
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/setup.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/private/setup.php b/lib/private/setup.php index d2f3802ebad..196ae8a8bce 100644 --- a/lib/private/setup.php +++ b/lib/private/setup.php @@ -427,10 +427,18 @@ class Setup { //custom 404 error page $content.= "\nErrorDocument 404 ".$webRoot."/core/templates/404.php"; + // ownCloud may be configured to live at the root folder without a + // trailing slash being specified. In this case manually set the + // rewrite base to `/` + $rewriteBase = $webRoot; + if($webRoot === '') { + $rewriteBase = '/'; + } + // Add rewrite base $content .= "\n<IfModule mod_rewrite.c>"; $content .= "\n RewriteRule . index.php [PT,E=PATH_INFO:$1]"; - $content .= "\n RewriteBase ".$webRoot; + $content .= "\n RewriteBase ".$rewriteBase; $content .= "\n <IfModule mod_env.c>"; $content .= "\n SetEnv front_controller_active true"; $content .= "\n <IfModule mod_dir.c>"; |