diff options
| -rw-r--r-- | htaccess.sample | 3 | ||||
| -rw-r--r-- | lib/util.php | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/htaccess.sample b/htaccess.sample index d81ec2481..07246a436 100644 --- 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¬ice=$1 [L,QSA] -RewriteRule ^deletenotice/((\d+))?$ index.php?action=deletenotice¬ice=$2 [L,QSA] +RewriteRule ^notice/delete/((\d+))?$ index.php?action=deletenotice¬ice=$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 43b2f2250..dcdb921d6 100644 --- 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': |