urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.ikiwiki.info into cvs

master
Amitai Schlair 2012-01-25 00:41:53 -05:00
parent 678c240eff bfda13f16c
commit c9c5264191
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Plugin/mdwn.pm
View File

@ -58,7 +58,7 @@ sub htmlize (@) {
}
}
if (! defined $markdown_sub &&
exists $config{nodiscount} && ! $config{nodiscount}) {
(! exists $config{nodiscount} || ! $config{nodiscount})) {
eval q{use Text::Markdown::Discount};
if (! $@) {
$markdown_sub=sub {

12
IkiWiki/Plugin/recentchangesdiff.pm
View File

@ -31,13 +31,21 @@ sub pagetemplate (@) {
my @lines=IkiWiki::rcs_diff($params{rev}, $maxlines+1);
if (@lines) {
my $diff;
my $trunc=0;
if (@lines > $maxlines) {
$diff=join("", @lines[0..($maxlines-1)])."\n".
gettext("(Diff truncated)");
$diff=join("", @lines[0..($maxlines-1)]);
$trunc=1;
}
else {
$diff=join("", @lines);
}
if (length $diff > 102400) {
$diff=substr($diff, 0, 10240);
$trunc=1;
}
if ($trunc) {
$diff.="\n".gettext("(Diff truncated)");
}
# escape html
$diff = encode_entities($diff);
# escape links and preprocessor stuff