smiley: Generate links relative to the destpage. (Fixes a reversion from 2.41.)

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index a8fed69e1ba12a021682a1d1e2b247b8e4c54e44..51b32b28fa1a1a18823ef3fed6206b53c8faffb3 100644 (file)
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -76,7 +76,7 @@ MATCH:        while (m{(?:^|(?<=\s|>))(\\?)$smiley_regexp(?:(?=\s|<)|$)}g) {
                else {
                        # Replace the smiley with its expanded value.
                        substr($_, $spos, length($smiley))=
                else {
                        # Replace the smiley with its expanded value.
                        substr($_, $spos, length($smiley))=

-                               htmllink($params{page}, $params{page},
+                               htmllink($params{page}, $params{destpage},

                                         $smileys{$smiley}, linktext => $smiley);
                }
        }
                                         $smileys{$smiley}, linktext => $smiley);
                }
        }

diff --git a/debian/changelog b/debian/changelog
index d92d5fa1ac74df8853f48007d73a5338855297a1..0492ff87c64f768bbd0d95f5dbfb5600259a7b93 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ ikiwiki (2.51) UNRELEASED; urgency=low
   * Add support for the universal edit button <http://universaleditbutton.org/>
     (To get this on all pages of an exiting wiki, rebuild the wiki.)
   * txt: New plugin, contributed by Gabriel McManus.
   * Add support for the universal edit button <http://universaleditbutton.org/>
     (To get this on all pages of an exiting wiki, rebuild the wiki.)
   * txt: New plugin, contributed by Gabriel McManus.

+  * smiley: Generate links relative to the destpage. (Fixes a reversion from
+    2.41.)

 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Jun 2008 15:03:33 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Jun 2008 15:03:33 -0400
 

diff --git a/doc/bugs/Problem_with_displaying_smileys_on_inline_page.mdwn b/doc/bugs/Problem_with_displaying_smileys_on_inline_page.mdwn
index c50d01c445887d061644b6ede70cc80e577ba74a..c0ee40715606f69e96d9143be42a0f4d1331714c 100644 (file)
--- a/doc/bugs/Problem_with_displaying_smileys_on_inline_page.mdwn
+++ b/doc/bugs/Problem_with_displaying_smileys_on_inline_page.mdwn
@@ -12,3 +12,9 @@ What about if I have main inline page, for example
 
 Do you have any idea how to fix it? I dont't want to have multiple
 `smileys` directory, of course :) --[[Paweł|ptecza]]
 
 Do you have any idea how to fix it? I dont't want to have multiple
 `smileys` directory, of course :) --[[Paweł|ptecza]]

+
+> I see that I broke this in commit
+> 0b9e849aba38f0695491ad5ca27de11632627ffe, presumably because a) sanitize
+> filters didn't get destpage at the time and b) I didn't think through
+> what that meant. Luckily, in the meantime, I added destpage to santize's
+> parameters, so it was easy to fix. [[done]] --[[Joey]]