* Encode & in diffurl in examples, to conform to pedantic rules.

[ikiwiki.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index b2d126977ae75dc07c199534230fdc665788c00e..424ce2c78493d5ecb21dee5f56787e54b1f23700 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -4,7 +4,8 @@ use warnings;
 use strict;
 use IkiWiki;
 use IkiWiki::UserInfo;
-use encoding 'utf8'; # force use of utf8 for io layer
+use open qw{:utf8 :std};
+use Encode;
 
 package IkiWiki;
 
@@ -33,6 +34,13 @@ sub cgi_recentchanges ($) { #{{{
        
        unlockwiki();
 
+       # Optimisation: building recentchanges means calculating lots of
+       # links. Memoizing htmllink speeds it up a lot (can't be memoized
+       # during page builds as the return values may change, but they
+       # won't here.)
+       eval q{use Memoize};
+       memoize("htmllink");
+
        my $template=template("recentchanges.tmpl"); 
        $template->param(
                title => "RecentChanges",
@@ -316,10 +324,13 @@ sub cgi_editpage ($$) { #{{{
        }
        $page=lc($page);
        
-       my $file=$page.$config{default_pageext};
+       my $file;
        if (exists $pagesources{lc($page)}) {
                $file=$pagesources{lc($page)};
        }
+       else {
+               $file=$page.".".$config{default_pageext};
+       }
        my $newfile=0;
        if (! -e "$config{srcdir}/$file") {
                $newfile=1;
@@ -352,7 +363,6 @@ sub cgi_editpage ($$) { #{{{
                require IkiWiki::Render;
                # Apparently FormBuilder doesn't not treat input as
                # utf-8, so decode from it.
-               require Encode;
                my $content = Encode::decode_utf8($form->field('editcontent'));
                my $comments = Encode::decode_utf8($form->field('comments'));
                $form->field(name => "editcontent",
@@ -360,7 +370,7 @@ sub cgi_editpage ($$) { #{{{
                $form->field(name => "comments",
                                value => $comments, force => 1);
                $form->tmpl_param("page_preview",
-                       htmlize($config{default_pageext},
+                       htmlize(pagetype($file),
                                linkify($page, $page, $content)));
        }
        else {
@@ -442,7 +452,6 @@ sub cgi_editpage ($$) { #{{{
                page_locked($page, $session);
                
                # Decode utf-8 since FormBuilder does not
-               require Encode;
                my $content=Encode::decode_utf8($form->field('editcontent'));
 
                $content=~s/\r\n/\n/g;