From 65282beca9e7b447262ea60396e7bebe7b63435d Mon Sep 17 00:00:00 2001 From: nicoulas Date: Thu, 10 Feb 2011 17:35:41 +0000 Subject: [PATCH] rewrote redirections for valentine's svn path=/trunk/; revision=19613 --- .htaccess | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 692d327ad8..3c4acb72a5 100644 --- a/.htaccess +++ b/.htaccess @@ -29,13 +29,19 @@ RewriteRule ^help/web\.(.*) /contribute/web/web.$1 [redirect=permanent] RewriteRule ^help/(.*) /donate/$1 [redirect=permanent] # Valentine campaign redirects. -RewriteRule ^valentine/(.*) /campaigns/valentine/2011/$1 [redirect=permanent] +# 2010 RewriteRule ^valentine-2010/(.*) /campaigns/valentine/2010/$1 [redirect=permanent] RewriteRule ^vd2010/(.*) /campaigns/valentine/2010/$1 [redirect=permanent] RewriteRule ^campaigns/vd2010/vd2010(.*) /campaigns/valentine/2010/valentine-2010$1 [redirect=permanent] RewriteRule ^campaigns/valentine-2010/vd2010(.*) /campaigns/valentine/2010/valentine-2010$1 [redirect=permanent] RewriteRule ^campaigns/vd2010/(.*) /campaigns/valentine/2010/$1 [redirect=permanent] RewriteRule ^campaigns/vd2010 /campaigns/valentine/2010/valentine-2010 [redirect=permanent] +# current +RewriteRule ^valentine/(.*) /campaigns/valentine/2011/valentine-2011$1 [redirect=permanent] + +RewriteCond %{REQUEST_URI} !2010 [NC] +RewriteRule ^campaigns/valentine/(.*html) /campaigns/valentine/2011/$1 [redirect=permanent] + # Temporary fix unitl we have a /freesoftware dir for contribute/advocacy/cwfs.en.html RewriteRule ^freesoftware/freesoftware(.*) /about/basics/freesoftware$1 [redirect=temp]