ugh, use subpages for discussion as a special case

diff --git a/ikiwiki b/ikiwiki
index 38dae8f24782750cbb9c2f028196c08afe3ca8ad..2130c4f78c1eac64715a869ac7c936b065501393 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -1131,8 +1131,15 @@ sub cgi_editpage ($$) { #{{{
                        else {
                                my $dir=$from."/";
                                $dir=~s![^/]+/$!!;
+                               
+                               if ($page eq 'discussion') {
+                                       $best_loc="$from/$page";
+                               }
+                               else {
+                                       $best_loc=$dir.$page;
+                               }
+                               
                                push @page_locs, $dir.$page;
-                               $best_loc=$dir.$page;
                                push @page_locs, "$from/$page";
                                while (length $dir) {
                                        $dir=~s![^/]+/$!!;