#422: Fix vcard parasitic "SORT-STRING"

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@688 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/ChangeLog b/ChangeLog
index b7ced6f..2497918 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -77,6 +77,7 @@ Bug/Wish:
         - #430: Specify date format on downtime admin page.                -Car
         - #397: Can edit death date in user admin page                     -FRU
         - #429: Tools to administrate duplicated adresses                  -FRU
+        - #390: Add date of request in validation form                     -FRU
 
     * Carnet:
         - #435: Calendar contains yearly events for all the contacts.      -FRU
@@ -89,6 +90,7 @@ Bug/Wish:
 
     * Profile:
         - #344: Tels can be bigger (up to 30 chars).                       -Car
+        - #422: Parasitic strings in vcard                                 -FRU
 
     * Xnet:
         - #426: Add an identification header in mails.                     -FRU

diff --git a/templates/vcard.tpl b/templates/vcard.tpl
index 3350703..930367a 100644 (file)
--- a/templates/vcard.tpl
+++ b/templates/vcard.tpl
@@ -66,7 +66,11 @@ ADR;TYPE=home{if $adr.courier},postal{/if};ENCODING=QUOTED-PRINTABLE:{format_adr
 {if $vcard.web}
 URL;ENCODING=QUOTED-PRINTABLE:{$vcard.web|qp_enc}
 {/if}
+{if strlen(trim($vcard.libre)) == 0}
+NOTE;ENCODING=QUOTED-PRINTABLE:{"(X`$vcard.promo`)"|qp_enc}
+{else}
 NOTE;ENCODING=QUOTED-PRINTABLE:{"(X`$vcard.promo`)\n`$vcard.libre`"|qp_enc}
+{/if}
 SORT-STRING;ENCODING=QUOTED-PRINTABLE:{$vcard.nom|qp_enc}
 REV:{$vcard.date|date_format:"%Y%m%dT000000Z"}
 END:VCARD