ui improvements

[git.ikiwiki.info.git] / IkiWiki / Plugin / link.pm

diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm
index 515a62bced96396a906dd6c84e2c5ec0335c0200..957355643d46badc05c2fd73d7f4b66b042669a1 100644 (file)
--- a/IkiWiki/Plugin/link.pm
+++ b/IkiWiki/Plugin/link.pm
@@ -8,12 +8,21 @@ use IkiWiki 2.00;
 my $link_regexp;
 
 sub import { #{{{
+       hook(type => "getsetup", id => "link", call => \&getsetup);
        hook(type => "checkconfig", id => "link", call => \&checkconfig);
        hook(type => "linkify", id => "link", call => \&linkify);
        hook(type => "scan", id => "link", call => \&scan);
        hook(type => "renamepage", id => "link", call => \&renamepage);
 } # }}}
 
+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },
+} #}}}
+
 sub checkconfig () { #{{{
        if ($config{prefix_directives}) {
                $link_regexp = qr{
@@ -90,8 +99,9 @@ sub renamepage (@) { #{{{
        $params{content} =~ s{(?<!\\)$link_regexp}{
                my $linktext=$2;
                my $link=$linktext;
-               if (bestlink($page, $2) eq $old) {
-                       $link=$new;
+               if (bestlink($page, IkiWiki::linkpage($linktext)) eq $old) {
+                       $link=IkiWiki::pagetitle($new, 1);
+                       $link=~s/ /_/g;
                        if ($linktext =~ m/.*\/*?[A-Z]/) {
                                # preserve leading cap of last component
                                my @bits=split("/", $link);