so make sure to let perl know it should be handled as utf8. Also,

* Improve layout of edit page so formatting help link is always visible w/o
  getting in the way of the preview.
master
joey 2006-07-02 17:44:43 +00:00
parent c7e06b65fd
commit 1452b3adf3
4 changed files with 13 additions and 8 deletions

View File

@ -34,11 +34,11 @@ sub htmlize ($$) { #{{{
if ($type eq '.mdwn') { if ($type eq '.mdwn') {
# XXX explanation of this insanity wating on perl bug number # XXX explanation of this insanity wating on perl bug number
$content=Encode::encode_utf8($content); # $content=Encode::encode_utf8($content);
$content=Encode::encode_utf8($content); $content=Encode::encode_utf8($content);
$content=Markdown::Markdown($content); $content=Markdown::Markdown($content);
$content=Encode::decode_utf8($content); $content=Encode::decode_utf8($content);
$content=Encode::decode_utf8($content); # $content=Encode::decode_utf8($content);
} }
else { else {
error("htmlization of $type not supported"); error("htmlization of $type not supported");

4
debian/changelog vendored
View File

@ -18,8 +18,10 @@ ikiwiki (1.8) UNRELEASED; urgency=low
* Add insane double encode/decode to utf8 around call to markdown. * Add insane double encode/decode to utf8 around call to markdown.
This works around a truely strange bug, which is apparently a bug in This works around a truely strange bug, which is apparently a bug in
perl, which I lack space to describe here (see t/crazy-badass-perl-bug.t) perl, which I lack space to describe here (see t/crazy-badass-perl-bug.t)
* Improve layout of edit page so formatting help link is always visible w/o
getting in the way of the preview.
-- Joey Hess <joeyh@debian.org> Sat, 1 Jul 2006 23:25:44 -0400 -- Joey Hess <joeyh@debian.org> Sun, 2 Jul 2006 13:43:56 -0400
ikiwiki (1.7) unstable; urgency=low ikiwiki (1.7) unstable; urgency=low

View File

@ -1 +1,5 @@
If you are editing a page using your www browser and hit the "Preview" button, the link to "HelpOnFormatting" on the bottom of the page disappears. This may be expected, or not. If you are editing a page using your www browser and hit the "Preview"
button, the link to "HelpOnFormatting" on the bottom of the page
disappears. This may be expected, or not.
[[bugs/done]]

View File

@ -38,17 +38,16 @@ Optional comment about this change:<br />
<TMPL_VAR FIELD-COMMENTS><br /> <TMPL_VAR FIELD-COMMENTS><br />
</TMPL_IF> </TMPL_IF>
<TMPL_VAR FORM-SUBMIT> <TMPL_VAR FORM-SUBMIT>
<TMPL_VAR HELPONFORMATTINGLINK>
<TMPL_VAR FORM-END> <TMPL_VAR FORM-END>
<hr />
<TMPL_IF NAME="PAGE_PREVIEW"> <TMPL_IF NAME="PAGE_PREVIEW">
<hr />
<div class="header"> <div class="header">
<span>Page preview:</span> <span>Page preview:</span>
</div> </div>
<div id="content"> <div id="content">
<TMPL_VAR PAGE_PREVIEW> <TMPL_VAR PAGE_PREVIEW>
</div> </div>
<TMPL_ELSE>
<TMPL_VAR HELPONFORMATTINGLINK>
</TMPL_IF> </TMPL_IF>
</body> </body>
</html> </html>