really add

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index c8d959edd11c4edf31b46fab0935e29bd0ff261e..ed74ff85e65daff5e8c6c76be5b02ef3c0f4733e 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -293,9 +293,7 @@ sub writefile ($$$;$$) { #{{{
                $writer->(\*OUT, $cleanup);
        }
        else {
-               if (length $content) {
-                       print OUT $content || error("failed writing to $newfile: $!", $cleanup);
-               }
+               print OUT $content or error("failed writing to $newfile: $!", $cleanup);
        }
        close OUT || error("failed saving $newfile: $!", $cleanup);
        rename($newfile, "$destdir/$file") || 
@@ -365,20 +363,18 @@ sub pagetitle ($;$) { #{{{
        my $unescaped=shift;
 
        if ($unescaped) {
-               $page=~s/__(\d+)__/chr($1)/eg;
+               $page=~s/(__(\d+)__|_)/$1 eq '_' ? ' ' : chr($2)/eg;
        }
        else {
-               $page=~s/__(\d+)__/&#$1;/g;
+               $page=~s/(__(\d+)__|_)/$1 eq '_' ? ' ' : "&#$2;"/eg;
        }
-       $page=~y/_/ /;
 
        return $page;
 } #}}}
 
 sub titlepage ($) { #{{{
        my $title=shift;
-       $title=~y/ /_/;
-       $title=~s/([^-[:alnum:]_:+\/.])/"__".ord($1)."__"/eg;
+       $title=~s/([^-[:alnum:]:+\/.])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
        return $title;
 } #}}}
 
@@ -621,11 +617,11 @@ sub unlockwiki () { #{{{
 sub commit_hook_enabled () { #{{{
        open(COMMITLOCK, "+>$config{wikistatedir}/commitlock") ||
                error ("cannot write to $config{wikistatedir}/commitlock: $!");
-       if (! flock(WIKILOCK, 1 | 4)) { # LOCK_SH | LOCK_NB to test
-               close WIKILOCK;
+       if (! flock(COMMITLOCK, 1 | 4)) { # LOCK_SH | LOCK_NB to test
+               close COMMITLOCK;
                return 0;
        }
-       close WIKILOCK;
+       close COMMITLOCK;
        return 1;
 } #}}}