From 1cc815f6735629d5dc2cc0509e09a67c515704eb Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 18 Sep 2012 22:06:36 +1200 Subject: [PATCH] MINOR Fixed sapphire -> framework redir (broken during upgrade) --- .htaccess | 1 + .htaccess_live | 1 + 2 files changed, 2 insertions(+) diff --git a/.htaccess b/.htaccess index 08c2d98..4579095 100644 --- a/.htaccess +++ b/.htaccess @@ -15,6 +15,7 @@ # Legacy rewrite from sapphire/ to framework/ namespace RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_URI} !^framework/main\.php + RewriteRule ^sapphire/?(.*) http://doc.silverstripe.org/framework/$1 [R=301,L] # DokuWiki rewrite rules: Need to happen before other rules in order to redirect /doku.php?id= # to /pagename, which can then be matched by the legacy rewrite rules further down diff --git a/.htaccess_live b/.htaccess_live index 08c2d98..4579095 100644 --- a/.htaccess_live +++ b/.htaccess_live @@ -15,6 +15,7 @@ # Legacy rewrite from sapphire/ to framework/ namespace RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_URI} !^framework/main\.php + RewriteRule ^sapphire/?(.*) http://doc.silverstripe.org/framework/$1 [R=301,L] # DokuWiki rewrite rules: Need to happen before other rules in order to redirect /doku.php?id= # to /pagename, which can then be matched by the legacy rewrite rules further down