Comparison

plugins/mod_mam/mod_mam.lua @ 8181:79f73af4c410

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 06 Jul 2017 11:24:36 +0200
parent 8172:66e32c34250b
child 8193:bb0118e46c45
comparison
equal deleted inserted replaced
8180:67a9ff352271 8181:79f73af4c410
139 start = qstart; ["end"] = qend; -- Time range 139 start = qstart; ["end"] = qend; -- Time range
140 with = qwith; 140 with = qwith;
141 limit = qmax + 1; 141 limit = qmax + 1;
142 before = before; after = after; 142 before = before; after = after;
143 reverse = reverse; 143 reverse = reverse;
144 total = use_total; 144 total = use_total or qmax == 0;
145 }); 145 });
146 146
147 if not data then 147 if not data then
148 origin.send(st.error_reply(stanza, "cancel", "internal-server-error", err)); 148 origin.send(st.error_reply(stanza, "cancel", "internal-server-error", err));
149 return true; 149 return true;