Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[ikiwiki.git] / IkiWiki / Plugin / cvs.pm

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 1a432c05248f2d8e74db1858d4c5b8271ec42310..71566d212ba71ea3b8c2296ffeb46c0101bea92d 100644 (file)
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -436,8 +436,9 @@ sub rcs_recentchanges ($) {
        return @ret;
 }
 
-sub rcs_diff ($) {
+sub rcs_diff ($;$) {
        my $rev=IkiWiki::possibly_foolish_untaint(int(shift));
+       my $maxlines=shift;
 
        local $CWD = $config{srcdir};
 
@@ -459,7 +460,9 @@ sub rcs_diff ($) {
 }
 
 sub rcs_getctime ($) {
-       my $file=$config{srcdir}."/".shift();
+       my $file=shift;
+
+       local $CWD = $config{srcdir};
 
        my $cvs_log_infoline=qr/^date: (.+);\s+author/;