diff options
| author | Kim Alvefur <zash@zash.se> | 2022-07-29 17:10:31 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2022-07-29 17:10:31 +0200 |
| commit | 9a375e444474e1e6a97ae57f393f639cfa813846 (patch) | |
| tree | 4850ca52c7e904255deaa68aedef374fb118c92d /plugins | |
| parent | c1a166daa79ec4fadd2083dd7097216068f74a28 (diff) | |
| parent | 2dbbce23823edbf4261df92175d7ee9cf7cca3a9 (diff) | |
| download | prosody-9a375e444474e1e6a97ae57f393f639cfa813846.tar.gz prosody-9a375e444474e1e6a97ae57f393f639cfa813846.zip | |
Merge 0.12->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_http_files.lua | 3 | ||||
| -rw-r--r-- | plugins/mod_storage_sql.lua | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index 69389b7f..b921116a 100644 --- a/plugins/mod_http_files.lua +++ b/plugins/mod_http_files.lua @@ -74,8 +74,7 @@ function serve(opts) if opts.index_files == nil then opts.index_files = dir_indices; end - -- TODO Crank up to warning - module:log("debug", "%s should be updated to use 'net.http.files' instead of mod_http_files", get_calling_module()); + module:log("warn", "%s should be updated to use 'net.http.files' instead of mod_http_files", get_calling_module()); return fileserver.serve(opts); end diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua index df5ab069..90a9316e 100644 --- a/plugins/mod_storage_sql.lua +++ b/plugins/mod_storage_sql.lua @@ -543,8 +543,7 @@ function archive_store:summary(username, query) SELECT DISTINCT "with", COUNT(*), MIN("when"), MAX("when") FROM "prosodyarchive" WHERE %s - GROUP BY "with" - ORDER BY "sort_id" %s%s; + GROUP BY "with"; ]]; local args = { host, user or "", store, }; local where = { "\"host\" = ?", "\"user\" = ?", "\"store\" = ?", }; @@ -557,8 +556,7 @@ function archive_store:summary(username, query) args[#args+1] = query.limit; end - sql_query = sql_query:format(t_concat(where, " AND "), query.reverse - and "DESC" or "ASC", query.limit and " LIMIT ?" or ""); + sql_query = sql_query:format(t_concat(where, " AND ")); return engine:select(sql_query, unpack(args)); end); if not ok then return ok, result end |