X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/93cd30bc0a882037ae2c65c8d6d3a9dc3d09c899..66a7b49acb06e0e9b3d0b31d087202d3c81d85e9:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 85d8eea68..2637f6017 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -544,12 +544,12 @@ sub loadplugins () {
 	}
 	
 	if ($config{rcs}) {
-		if (exists $IkiWiki::hooks{rcs}) {
+		if (exists $hooks{rcs}) {
 			error(gettext("cannot use multiple rcs plugins"));
 		}
 		loadplugin($config{rcs});
 	}
-	if (! exists $IkiWiki::hooks{rcs}) {
+	if (! exists $hooks{rcs}) {
 		loadplugin("norcs");
 	}
 
@@ -2052,10 +2052,10 @@ sub match_link ($$;@) {
 		else {
 			return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
 				if match_glob($p, $link, %params);
-			$p=~s/^\///;
+			my ($p_rel)=$p=~/^\/?(.*)/;
 			$link=~s/^\///;
-			return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
-				if match_glob($p, $link, %params);
+			return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link")
+				if match_glob($p_rel, $link, %params);
 		}
 	}
 	return IkiWiki::FailReason->new("$page does not link to $link");