From c78c35688baacbd2b933a8248cec574d2f63987b Mon Sep 17 00:00:00 2001
From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 15 Feb 2011 00:31:18 +0000
Subject: Combining two rewrite rules into one

git-svn-id: http://code.elgg.org/elgg/trunk@8241 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 htaccess_dist | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'htaccess_dist')

diff --git a/htaccess_dist b/htaccess_dist
index 3295ed87a..4508c539b 100644
--- a/htaccess_dist
+++ b/htaccess_dist
@@ -106,8 +106,7 @@ RewriteRule ^cache\/(.*)$ engine/handlers/cache_handler.php?request=$1&%{QUERY_S
 
 RewriteRule ^services\/api\/([A-Za-z0-9\_\-]+)\/(.*)$ engine/handlers/service_handler.php?handler=$1&request=$2&%{QUERY_STRING}
 
-RewriteRule ^export\/([A-Za-z]+)\/([0-9]+)$ engine/handlers/export_handler.php?view=$1&guid=$2
-RewriteRule ^export\/([A-Za-z]+)\/([0-9]+)\/$ engine/handlers/export_handler.php?view=$1&guid=$2
+RewriteRule ^export\/([A-Za-z]+)\/([0-9]+)\/?$ engine/handlers/export_handler.php?view=$1&guid=$2
 RewriteRule ^export\/([A-Za-z]+)\/([0-9]+)\/([A-Za-z]+)\/([A-Za-z0-9\_]+)\/$ engine/handlers/export_handler.php?view=$1&guid=$2&type=$3&idname=$4
 
 RewriteRule xml-rpc.php engine/handlers/xml-rpc_handler.php
-- 
cgit v1.2.3