summaryrefslogtreecommitdiff
path: root/htaccess.sample
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-01-23 08:43:34 +0000
committerZach Copley <zach@controlyourself.ca>2009-01-23 08:43:34 +0000
commit1305ecf4bd58b8651fd8648d65263a24ed47bbc6 (patch)
treef4437adc6e405e1c3e1118c8f7e38d5802d0f55a /htaccess.sample
parent76cf3cc3d0046e1d94c8a7dcb7c2fff21e145ee5 (diff)
parentbe21ed13b5160646cc4feb7c572d878bc0ee464d (diff)
Merge branch 'master' of /var/www/trunk
Diffstat (limited to 'htaccess.sample')
-rw-r--r--htaccess.sample15
1 files changed, 8 insertions, 7 deletions
diff --git a/htaccess.sample b/htaccess.sample
index d94652bfd..5f9827f96 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -89,13 +89,14 @@ RewriteRule ^peopletag/([a-zA-Z0-9]+)$ index.php?action=peopletag&tag=$1 [L,QSA]
RewriteRule ^featured/?$ index.php?action=featured [L,QSA]
RewriteRule ^favorited/?$ index.php?action=favorited [L,QSA]
-RewriteRule ^group/new index.php?action=newgroup [L,QSA]
-RewriteRule ^group/([a-zA-Z0-9]+)/edit index.php?action=editgroup&nickname=$1 [L,QSA]
-RewriteRule ^group/([a-zA-Z0-9]+)/join index.php?action=joingroup&nickname=$1 [L,QSA]
-RewriteRule ^group/([a-zA-Z0-9]+)/leave index.php?action=leavegroup&nickname=$1 [L,QSA]
-RewriteRule ^group/([a-zA-Z0-9]+)/members index.php?action=groupmembers&nickname=$1 [L,QSA]
-RewriteRule ^group/([0-9]+)/id index.php?action=groupbyid&id=$1 [L,QSA]
-RewriteRule ^group/([a-zA-Z0-9]+)/rss index.php?action=grouprss&nickname=$1 [L,QSA]
+RewriteRule ^group/new$ index.php?action=newgroup [L,QSA]
+RewriteRule ^group/([a-zA-Z0-9]+)/edit$ index.php?action=editgroup&nickname=$1 [L,QSA]
+RewriteRule ^group/([a-zA-Z0-9]+)/join$ index.php?action=joingroup&nickname=$1 [L,QSA]
+RewriteRule ^group/([a-zA-Z0-9]+)/leave$ index.php?action=leavegroup&nickname=$1 [L,QSA]
+RewriteRule ^group/([a-zA-Z0-9]+)/members$ index.php?action=groupmembers&nickname=$1 [L,QSA]
+RewriteRule ^group/([a-zA-Z0-9]+)/logo$ index.php?action=grouplogo&nickname=$1 [L,QSA]
+RewriteRule ^group/([0-9]+)/id$ index.php?action=groupbyid&id=$1 [L,QSA]
+RewriteRule ^group/([a-zA-Z0-9]+)/rss$ index.php?action=grouprss&nickname=$1 [L,QSA]
RewriteRule ^group/([a-zA-Z0-9]+)$ index.php?action=showgroup&nickname=$1 [L,QSA]
RewriteRule ^group$ index.php?action=groups [L,QSA]