From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sun, 3 Sep 2006 16:25:47 +0000 (+0000)
Subject: releasing version 1.23
X-Git-Tag: 1.23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fdaab0fdddcb332cfd9386bef385eb167ba51cb1;p=ikiwiki.git

releasing version 1.23
---

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 724cdf315..8ceaa95e0 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -95,7 +95,7 @@ sub preprocess_inline (@) { #{{{
 			# is to let the meta plugin get page title info; so stop
 			# calling this next line then once the meta plugin can
 			# store that accross runs (also tags plugin).
-			my $content=get_inline_content($page, $params{page});
+			my $content=get_inline_content($page, $params{destpage});
 			# Don't use htmllink because this way the title is separate
 			# and can be overridden by other plugins.
 			my $link=htmlpage(bestlink($params{page}, $page));
@@ -199,11 +199,11 @@ sub rsspage ($) { #{{{
 } #}}}
 
 sub genrss ($$@) { #{{{
-	my $desc = shift;
+	my $desc=shift;
 	my $page=shift;
 	my @pages=@_;
 	
-	my $url=URI->new(encode_utf8("$config{url}/".htmlpage($page)));
+	my $url=URI->new(encode_utf8($config{url}."/".htmlpage($page)));
 	
 	my $itemtemplate=template("rssitem.tmpl", blind_cache => 1);
 	my $content="";
diff --git a/debian/changelog b/debian/changelog
index 080f9ef4d..72f4554b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (1.23) unstable; urgency=low
+
+  * Allow inline directives to be nested inside eg, sidebars. Closes: #385512
+
+ -- Joey Hess <joeyh@debian.org>  Sun,  3 Sep 2006 12:14:45 -0400
+
 ikiwiki (1.22) unstable; urgency=low
 
   * Change how the stylesheet url is determined in the templates: Remove