diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-09-26 06:08:24 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-09-26 06:08:24 +0000 |
| commit | b78e139c50600f631991f8eac06815d6cf45cc35 (patch) | |
| tree | 18a8666dcacbc74eea469cdcada832eb84475671 | |
| parent | db8c6d855067221f597b06dec0ab4364efe1f704 (diff) | |
| download | ikiwiki-b78e139c50600f631991f8eac06815d6cf45cc35.tar ikiwiki-b78e139c50600f631991f8eac06815d6cf45cc35.tar.gz | |
* Don't fail syntax check if Text::Typography isn't installed.
Closes: #389406
| -rw-r--r-- | IkiWiki/Plugin/typography.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/typography.pm b/IkiWiki/Plugin/typography.pm index 6c5f06b0f..682dadab7 100644 --- a/IkiWiki/Plugin/typography.pm +++ b/IkiWiki/Plugin/typography.pm @@ -5,7 +5,6 @@ package IkiWiki::Plugin::typography; use warnings; use strict; use IkiWiki; -use Text::Typography; sub import { #{{{ IkiWiki::hook(type => "sanitize", id => "typography", call => \&sanitize); @@ -14,6 +13,9 @@ sub import { #{{{ sub sanitize (@) { #{{{ my %params=@_; + eval q{use Text::Typography}; + return $params{content} if $@; + return Text::Typography::typography($params{content}); } # }}} diff --git a/debian/changelog b/debian/changelog index dcc7a7eb3..fd48a6135 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (1.28) UNRELEASED; urgency=low +ikiwiki (1.28) unstable; urgency=low * inline: Add ability to sort by page name, based on a patch from Benjamin A'Lee. @@ -6,8 +6,10 @@ ikiwiki (1.28) UNRELEASED; urgency=low braindead interface. Closes: #389383 * Don't rm -rf ikiwiki on distclean, since a) there's no such file and b) those poor Mac OSX users and their case insensative files! + * Don't fail syntax check if Text::Typography isn't installed. + Closes: #389406 - -- Joey Hess <joeyh@debian.org> Mon, 25 Sep 2006 17:40:48 -0400 + -- Joey Hess <joeyh@debian.org> Tue, 26 Sep 2006 02:08:17 -0400 ikiwiki (1.27) unstable; urgency=low |