change 'deletenotice' to 'notice/delete'

darcs-hash:20080726034209-84dde-02b25960aeb361319f8037b17aed6290d477cf7b.gz

diff --git a/htaccess.sample b/htaccess.sample
index d81ec24813dafd325cc90cde843d8cecded92929..07246a4366e15e3b7f0bd90e0dae6d3e3484adec 100644 (file)
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -43,7 +43,8 @@ RewriteRule ^search/notice/rss$ index.php?action=noticesearchrss [L,QSA]
 
 RewriteRule ^notice/new$ index.php?action=newnotice [L,QSA]
 RewriteRule ^notice/(\d+)$ index.php?action=shownotice&notice=$1 [L,QSA]
-RewriteRule ^deletenotice/((\d+))?$ index.php?action=deletenotice&notice=$2 [L,QSA]
+RewriteRule ^notice/delete/((\d+))?$ index.php?action=deletenotice&notice=$2 [L,QSA]
+RewriteRule ^notice/delete$ index.php?action=deletenotice [L,QSA]
 
 RewriteRule ^user/(\d+)$ index.php?action=userbyid&id=$1 [L,QSA]
 

diff --git a/lib/util.php b/lib/util.php
index 43b2f22505480519dd8224e4997d2042218438cc..dcdb921d606fa3ec07416b5dbff79863fc4d72f4 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -825,9 +825,9 @@ function common_fancy_url($action, $args=NULL) {
                return common_path('notice/'.$args['notice']);
         case 'deletenotice':
                 if ($args && $args['notice']) {
-                        return common_path('deletenotice/'.$args['notice']);
+                        return common_path('notice/delete/'.$args['notice']);
                 } else {
-                        return common_path('deletenotice/');
+                        return common_path('notice/delete');
                 }
         case 'xrds':
         case 'foaf':