rename: Fix double-escaping of page name in edit box.

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 17cc46e0e7c63cd24da4c48806f214ecddd506c5..d6ef6c54c7d86f7b9e3f1a263806e14cb962ce17 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -312,8 +312,7 @@ sub preprocess_inline (@) { #{{{
                # emptyfeeds cannot be hidden.
                $emptyfeeds=1;
        }
                # emptyfeeds cannot be hidden.
                $emptyfeeds=1;
        }

-       elsif ($feeds && !$params{preview} &&
-              ! (! $emptyfeeds && ! @feedlist)) {
+       elsif ($feeds && !$params{preview} && ($emptyfeeds || @feedlist)) {

                # Add feed buttons.
                my $linktemplate=template("feedlink.tmpl", blind_cache => 1);
                $linktemplate->param(rssurl => $rssurl) if $rss;
                # Add feed buttons.
                my $linktemplate=template("feedlink.tmpl", blind_cache => 1);
                $linktemplate->param(rssurl => $rssurl) if $rss;


@@ -390,7 +389,7 @@ sub preprocess_inline (@) { #{{{
                }
        }
        
                }
        }
        

-       if ($feeds && ! (! $emptyfeeds && ! @feedlist)) {
+       if ($feeds && ($emptyfeeds || @feedlist)) {

                if ($rss) {
                        my $rssp=$feedbase."rss".$feednum;
                        will_render($params{destpage}, $rssp);
                if ($rss) {
                        my $rssp=$feedbase."rss".$feednum;
                        will_render($params{destpage}, $rssp);