Combining two rewrite rules into one

git-svn-id: http://code.elgg.org/elgg/trunk@8241 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/htaccess_dist b/htaccess_dist
index 3295ed87a2c1bbbf9b4f4fb868877fd1773cd81d..4508c539bf3f2faf469347c632616eaad1deed66 100644 (file)
--- 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