aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-10-08 01:23:43 +0200
committerKim Alvefur <zash@zash.se>2017-10-08 01:23:43 +0200
commit30ac4f0bef3476ebace0ec4c5f4c3b54393c746c (patch)
treed96a14ca00bdf1bf8582f97296b7204b95969bc8
parent3ccf9b9891baeccdd74912594b420cbbe79877c5 (diff)
downloadprosody-30ac4f0bef3476ebace0ec4c5f4c3b54393c746c.tar.gz
prosody-30ac4f0bef3476ebace0ec4c5f4c3b54393c746c.zip
mod_pubsub: Remove workaround for SQL issue (fixed in becb593ed86d)
-rw-r--r--plugins/mod_pubsub/pubsub.lib.lua6
1 files changed, 1 insertions, 5 deletions
diff --git a/plugins/mod_pubsub/pubsub.lib.lua b/plugins/mod_pubsub/pubsub.lib.lua
index 57055462..e33fe836 100644
--- a/plugins/mod_pubsub/pubsub.lib.lua
+++ b/plugins/mod_pubsub/pubsub.lib.lua
@@ -356,11 +356,7 @@ local function simple_itemstore(archive, config, user, node, expose_publisher)
module:log("error", "Unable to get item: %s", err);
return nil, err;
end
- -- Workaround for buggy SQL drivers which require iterating until we get a nil.
- local id, payload, when, publisher;
- for a, b, c, d in data do
- id, payload, when, publisher = a, b, c, d;
- end
+ local id, payload, when, publisher = data();
module:log("debug", "Get item %s (published at %s by %s) from store %s", id, when, publisher, store);
if id == nil then
return nil;