summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Plugin/inline.pm6
-rw-r--r--debian/changelog6
2 files changed, 9 insertions, 3 deletions
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