Merge 0.10->trunk

[prosody.git] / util / vcard.lua

diff --git a/util/vcard.lua b/util/vcard.lua
index 152b0b2dfe903620ba24f347859f07f772d3682c..8aafa24d308e6b993c35fb6287795b3813228ba4 100644 (file)
--- a/util/vcard.lua
+++ b/util/vcard.lua
@@ -349,7 +349,11 @@ local function item_to_vcard4(item)
        if prop_def == "text" then
                t:tag("text"):text(item[1]):up();
        elseif prop_def == "uri" then
-               t:tag("uri"):text(item[1]):up();
+               if item.ENCODING and item.ENCODING[1] == 'b' then
+                       t:tag("uri"):text("data:;base64,"):text(item[1]):up();
+               else
+                       t:tag("uri"):text(item[1]):up();
+               end
        elseif type(prop_def) == "table" then
                if prop_def.values then
                        for i, v in ipairs(prop_def.values) do