Bug#451376: ikiwiki: inline plugin: allow moving feedlinks below inlined content

[Nis Martensen]

Of course, I forgot to attach the patches...

>From f5d7b98a47d880fee8af639879cb5a694a39d72e Mon Sep 17 00:00:00 2001
From: Nis Martensen <[EMAIL PROTECTED]>
Date: Thu, 13 Dec 2007 09:56:59 +0100
Subject: [PATCH] Also increment feednum only if feeds are generated

---
 IkiWiki/Plugin/inline.pm |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 3a03b55..3c0c6f1 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -161,7 +161,9 @@ sub preprocess_inline (@) { #{{{
 	}
 	else {
 		if (exists $page_numfeeds{$params{destpage}}) {
-			$feednum=$knownfeeds{$feedid}=++$page_numfeeds{$params{destpage}};
+			if ($feeds) {
+				$feednum=$knownfeeds{$feedid}=++$page_numfeeds{$params{destpage}};
+			}
 		}
 		else {
 			$feednum=$knownfeeds{$feedid}="";
-- 
1.5.3.7.1077.gcec9


>From f804194392db97c3ac2130bab48407aa74b07c6f Mon Sep 17 00:00:00 2001
From: Nis Martensen <[EMAIL PROTECTED]>
Date: Thu, 13 Dec 2007 09:58:55 +0100
Subject: [PATCH] rssurl and atomurl are only needed where $feeds is set

---
 IkiWiki/Plugin/inline.pm |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 3c0c6f1..b28ad27 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -173,8 +173,10 @@ sub preprocess_inline (@) { #{{{
 		}
 	}
 
-	my $rssurl=basename(rsspage($params{destpage}).$feednum);
-	my $atomurl=basename(atompage($params{destpage}).$feednum);
+	if ($feeds) {
+		my $rssurl=basename(rsspage($params{destpage}).$feednum);
+		my $atomurl=basename(atompage($params{destpage}).$feednum);
+	}
 	my $ret="";
 
 	if ($config{cgiurl} && (exists $params{rootpage} ||
-- 
1.5.3.7.1077.gcec9