From 355efb9a7f74a2035f595bbd0d03375710d08587 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 25 Jan 2012 09:43:56 -0500
Subject: [PATCH] Merged revisions 2886-2909 from stable branch.

---
 interface/web/sites/templates/web_domain_redirect.htm |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/interface/web/sites/templates/web_domain_redirect.htm b/interface/web/sites/templates/web_domain_redirect.htm
index d3d8637..1c78b41 100644
--- a/interface/web/sites/templates/web_domain_redirect.htm
+++ b/interface/web/sites/templates/web_domain_redirect.htm
@@ -51,13 +51,14 @@
 					jQuery('#redirect_type option[value="R"]').hide();
 					jQuery('#redirect_type option[value="L"]').hide();
 					jQuery('#redirect_type option[value="R,L"]').hide();
+					jQuery('#redirect_type option[value="R=301,L"]').hide();
 					if(selected != "no" && selected != "" && selected != "last"  && selected != "break"  && selected != "redirect"  && selected != "permanent") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
 				} else {
 					jQuery('#redirect_type option[value="last"]').hide();
 					jQuery('#redirect_type option[value="break"]').hide();
 					jQuery('#redirect_type option[value="redirect"]').hide();
 					jQuery('#redirect_type option[value="permanent"]').hide();
-					if(selected != "no" && selected != "" && selected != "R"  && selected != "L"  && selected != "R,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+					if(selected != "no" && selected != "" && selected != "R"  && selected != "L"  && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
 				}
 			});
 		}

--
Gitblit v1.9.1