mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.9->0.10

Browse source
This commit is contained in:
Kim Alvefur 2014-04-23 00:22:36 +02:00
commit a4b456c857
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/jabberd14sql2prosody.lua
View file

@ -428,7 +428,7 @@ end
end
-- import modules
package.path = package.path.."..\?.lua;";
package.path = package.path..";../?.lua;";
local my_name = arg[0];
if my_name:match("[/\\]") then

9
util/dataforms.lua
View file

@ -94,6 +94,15 @@ function form_t.form(layout, data, formtype)
end
end
local media = field.media;
if media then
form:tag("media", { xmlns = "urn:xmpp:media-element", height = media.height, width = media.width });
for _, val in ipairs(media) do
form:tag("uri", { type = val.type }):text(val.uri):up()
end
form:up();
end
if field.required then
form:tag("required"):up();
end