aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-15 00:31:18 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-15 00:31:18 +0000
commitc78c35688baacbd2b933a8248cec574d2f63987b (patch)
tree28f45c85132f11c2e5defbd2c9587a11635e15f8
parent640eec398e8b5493b3d1721f916ea34706e22ddd (diff)
downloadelgg-c78c35688baacbd2b933a8248cec574d2f63987b.tar.gz
elgg-c78c35688baacbd2b933a8248cec574d2f63987b.tar.bz2
Combining two rewrite rules into one
git-svn-id: http://code.elgg.org/elgg/trunk@8241 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--htaccess_dist3
1 files changed, 1 insertions, 2 deletions
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