mod_bookmarks2: Fix handling of nick and password elements
authorKim Alvefur <zash@zash.se>
Wed, 03 Nov 2021 21:11:55 +0100
changeset 4742 5aee8d86629a
parent 4741 2bc5a0c0d8c3
child 4743 fdd9e5d89d73
mod_bookmarks2: Fix handling of nick and password elements This form of child retrieval fails when the stanza elements internally don't have an 'xmlns' attribute, which can happen sometimes for some reason, including when they have been constructed via the stanza builder API. When that is the case then the explicit namespace arguemnt does not match the nil value of the internal attribute. Calling `:get_child()` without the namespace argument does the right thing here, with both nil and the parent namespace as valid values for the internal attribute.
mod_bookmarks2/mod_bookmarks2.lua
--- a/mod_bookmarks2/mod_bookmarks2.lua	Wed Nov 03 20:15:14 2021 +0100
+++ b/mod_bookmarks2/mod_bookmarks2.lua	Wed Nov 03 21:11:55 2021 +0100
@@ -67,11 +67,11 @@
 		local bookmark = item:get_child("conference", namespace);
 		conference.attr.name = bookmark.attr.name;
 		conference.attr.autojoin = bookmark.attr.autojoin;
-		local nick = bookmark:get_child_text("nick", namespace);
+		local nick = bookmark:get_child_text("nick");
 		if nick ~= nil then
 			conference:text_tag("nick", nick, { xmlns = "storage:bookmarks" }):up();
 		end
-		local password = bookmark:get_child_text("password", namespace);
+		local password = bookmark:get_child_text("password");
 		if password ~= nil then
 			conference:text_tag("password", password):up();
 		end