From 6c286bfde4567cd3db2f758dfe49eb65524bebf9 Mon Sep 17 00:00:00 2001 From: gollo Date: Fri, 1 Jul 2011 06:12:37 +0000 Subject: [PATCH] 2011-07-01 Martin Gollowitzer * trying to fix the redirection loop svn path=/trunk/; revision=20794 --- .htaccess | 7 ++++++- campaigns/.htaccess | 4 ---- 2 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 campaigns/.htaccess diff --git a/.htaccess b/.htaccess index a491403d14..fd45615698 100644 --- a/.htaccess +++ b/.htaccess @@ -39,7 +39,12 @@ RewriteRule ^campaigns/valentine-2010/(.*).svg /campaigns/valentine/$1.svg [redi 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] +RewriteRule ^valentine/valentine(.*) /campaigns/valentine/2011/valentine-2011$1 [redirect=permanent] + +# trying fix the dirty hack redirection loop from 2011-06-30 +RewriteRule ^campaigns/valentine/valentine(.*) /campaigns/valentine/2011/valentine-2011$1 [redirect=temp] +RewriteRule ^campaigns/valentine/2011/valentine.([A-Za-z]{2}).html /campaigns/valentine/2011/valentine-2011$1 [redirect=temp] + # AskYourCandidates redirect RewriteRule ^campaigns/ayc(.*) /campaigns/askyourcandidates$1 [redirect=permanent] diff --git a/campaigns/.htaccess b/campaigns/.htaccess deleted file mode 100644 index fbbf1d72f8..0000000000 --- a/campaigns/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ -RewriteEngine On - -RewriteRule ^valentine/valentine(.*) /campaigns/valentine/2011/valentine-2011$1 [redirect=temp] -RewriteRule ^valentine/2011/valentine(.*) /campaigns/valentine/2011/valentine-2011$1 [redirect=temp]