summaryrefslogtreecommitdiffstats
path: root/htaccess.dist
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-03-14 14:09:45 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-03-14 14:09:45 +0000
commitc12e6b14992be14aff58756f59019ef59a1f40ae (patch)
tree52e3255b06260a7d5cca733e062fccb64a601a07 /htaccess.dist
parentdbab9e4f70884da0867d6623009d6237270863dc (diff)
downloadwordpress-mu-c12e6b14992be14aff58756f59019ef59a1f40ae.tar.gz
wordpress-mu-c12e6b14992be14aff58756f59019ef59a1f40ae.tar.xz
wordpress-mu-c12e6b14992be14aff58756f59019ef59a1f40ae.zip
Add a trailing slash to URLs ending in /wp-admin, fixes #351, props deanbag
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1211 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'htaccess.dist')
-rw-r--r--htaccess.dist5
1 files changed, 4 insertions, 1 deletions
diff --git a/htaccess.dist b/htaccess.dist
index 0f14905..1dba0e0 100644
--- a/htaccess.dist
+++ b/htaccess.dist
@@ -1,11 +1,14 @@
RewriteEngine On
RewriteBase BASE/
-
#uploaded files
RewriteRule ^(.*/)?files/$ index.php [L]
RewriteRule ^(.*/)?files/(.*) wp-content/blogs.php?file=$2 [L]
+# add a trailing slash to /wp-admin
+RewriteCond %{REQUEST_URI} ^.*/wp-admin$
+RewriteRule ^(.+)$ /$1/ [R=301,L]
+
RewriteCond %{REQUEST_FILENAME} -f [OR]
RewriteCond %{REQUEST_FILENAME} -d
RewriteRule . - [L]