releasing version 1.23

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 724cdf315d34854d8094ffdfd2f08f32645f51a0..8ceaa95e09f0f491401248716dc365ddd73a41b5 100644 (file)
--- 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 080f9ef4d4812505ef683c2ba1f922c4449122b6..72f4554b5e026f2c30ff0f515792c0d10a78f948 100644 (file)
--- 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