Commit 0b77531b authored by Marius Cramer's avatar Marius Cramer

Revert "Fixed: FS#3581 - Website unaccessible under some circumstances when...

Revert "Fixed: FS#3581 - Website unaccessible under some circumstances when using seo redirection *.domain to www.domain"

This reverts commit 5742e4c9.
parent 5742e4c9
......@@ -339,12 +339,10 @@
<tmpl_if name="rewrite_enabled">
RewriteEngine on
<tmpl_if name='seo_redirect_enabled'>
RewriteCond %{HTTP_HOST} <tmpl_var name='seo_base_domain'>$ [NC]
RewriteCond %{HTTP_HOST} <tmpl_var name='seo_redirect_operator'>^<tmpl_var name='seo_redirect_origin_domain'>$ [NC]
RewriteRule ^(.*)$ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='seo_redirect_target_domain'>$1 [R=301,L]
</tmpl_if>
<tmpl_loop name="alias_seo_redirects">
RewriteCond %{HTTP_HOST} <tmpl_var name='alias_seo_base_domain'>$ [NC]
RewriteCond %{HTTP_HOST} <tmpl_var name='alias_seo_redirect_operator'>^<tmpl_var name='alias_seo_redirect_origin_domain'>$ [NC]
RewriteRule ^(.*)$ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='alias_seo_redirect_target_domain'>$1 [R=301,L]
</tmpl_loop>
......
......@@ -2951,8 +2951,6 @@ class apache2_plugin {
$seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
$seo_redirects[$prefix.'seo_redirect_operator'] = '!';
}
$seo_redirects[$prefix.'seo_base_domain'] = str_replace('.', '\.', $web['domain']);
return $seo_redirects;
}
......
......@@ -2842,8 +2842,6 @@ class nginx_plugin {
$seo_redirects[$prefix.'seo_redirect_operator'] = '!=';
}
}
$seo_redirects[$prefix.'seo_base_domain'] = str_replace('.', '\.', $web['domain']);
return $seo_redirects;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment