lockedit: Support specifying which users (and IP addresses) a page is locked for...

[git.ikiwiki.info.git] / IkiWiki / Plugin / inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 8efef3fc85ccc7883172f185b67dc57ff86ec19c..5d2ef5681b3d6ab84f16932f8e5efdbc030345a3 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -119,7 +119,7 @@ sub sessioncgi () { #{{{
        my $session=shift;
 
        if ($q->param('do') eq 'blog') {
-               my $page=IkiWiki::titlepage(decode_utf8($q->param('title')));
+               my $page=titlepage(decode_utf8($q->param('title')));
                $page=~s/(\/)/"__".ord($1)."__"/eg; # don't create subdirs
                # if the page already exists, munge it to be unique
                my $from=$q->param('from');
@@ -266,6 +266,9 @@ sub preprocess_inline (@) { #{{{
                my $rootpage;
                if (exists $params{rootpage}) {
                        $rootpage=bestlink($params{page}, $params{rootpage});
+                       if (!length $rootpage) {
+                               $rootpage=$params{rootpage};
+                       }
                }
                else {
                        $rootpage=$params{page};