From 613ba9ff7767991fff162cb65c5791c5ef0445db Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Sat, 5 Jul 2008 17:54:45 +0200 Subject: [PATCH] Convert miniwiki of the freetext to text in the vcards. Signed-off-by: Florent Bruneau --- plugins/modifier.miniwiki.php | 8 ++++++-- templates/core/vcard.tpl | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/modifier.miniwiki.php b/plugins/modifier.miniwiki.php index aef58da..d47e221 100644 --- a/plugins/modifier.miniwiki.php +++ b/plugins/modifier.miniwiki.php @@ -21,9 +21,13 @@ require_once 'platal.inc.php'; -function smarty_modifier_miniwiki($string, $format = 'no_title') +function smarty_modifier_miniwiki($string, $format = 'no_title', $type = 'html') { - return MiniWiki::wikiToHTML($string, $format == 'title'); + if ($type == 'html') { + return MiniWiki::wikiToHTML($string, $format == 'title'); + } else { + return MiniWiki::wikiToText($string, false, 0, 80, $format == 'title'); + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: diff --git a/templates/core/vcard.tpl b/templates/core/vcard.tpl index c3e3097..d0524a1 100644 --- a/templates/core/vcard.tpl +++ b/templates/core/vcard.tpl @@ -75,7 +75,7 @@ URL:{$vcard.web} {if strlen(trim($vcard.freetext)) == 0} NOTE:(X{$vcard.promo}) {else} -NOTE:(X{$vcard.promo})\n{$vcard.freetext|vcard_enc} +NOTE:(X{$vcard.promo})\n{$vcard.freetext|miniwiki:'no_title':'text'|vcard_enc} {/if} {if $vcard.section} X-SECTION:{$vcard.section} -- 2.1.4