Merge branch 'master' of ../trunk

[quix0rs-gnu-social.git] / htaccess.sample

diff --git a/htaccess.sample b/htaccess.sample
index caf44bab8ea530218a9d68e17b71bd654db71745..a0fc742489305ae5b94c1abaa60fe45f0df553ff 100644 (file)
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -86,13 +86,13 @@ 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]+) index.php?action=showgroup&nickname=$1 [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/([a-zA-Z0-9]+)$ index.php?action=showgroup&nickname=$1 [L,QSA]
 
 # Twitter-compatible API rewrites
 # XXX: Surely these can be refactored a little -- Zach