From 7e8a58923f5e59c1310e9d20779bf70c99496905 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 25 Jul 2008 23:42:09 -0400 Subject: [PATCH] change 'deletenotice' to 'notice/delete' darcs-hash:20080726034209-84dde-02b25960aeb361319f8037b17aed6290d477cf7b.gz --- htaccess.sample | 3 ++- lib/util.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/htaccess.sample b/htaccess.sample index d81ec24813..07246a4366 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 43b2f22505..dcdb921d60 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': -- 2.39.5