diff options
| author | Kim Alvefur <zash@zash.se> | 2015-07-05 18:00:05 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-07-05 18:00:05 +0200 |
| commit | 5c4f162797b7f2ba6faa6f9f3ce0ed5db7bee0ad (patch) | |
| tree | ffbe134470891e53fe689b44843c22b48c6b680b /plugins/mod_storage_sql2.lua | |
| parent | 6e187489a98a403ae236a9595fbd0f80d3ff6490 (diff) | |
| parent | c9035dd6cdab062206e57e3df9415cb8e6f0bc0a (diff) | |
| download | prosody-5c4f162797b7f2ba6faa6f9f3ce0ed5db7bee0ad.tar.gz prosody-5c4f162797b7f2ba6faa6f9f3ce0ed5db7bee0ad.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_storage_sql2.lua')
| -rw-r--r-- | plugins/mod_storage_sql2.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua index 9a9e6061..1702108c 100644 --- a/plugins/mod_storage_sql2.lua +++ b/plugins/mod_storage_sql2.lua @@ -413,10 +413,10 @@ local function upgrade_table(params, apply_changes) end local function normalize_params(params) - assert(params.driver and params.database, "Configuration error: Both the SQL driver and the database need to be specified"); if params.driver == "SQLite3" then params.database = resolve_relative_path(prosody.paths.data or ".", params.database or "prosody.sqlite"); end + assert(params.driver and params.database, "Configuration error: Both the SQL driver and the database need to be specified"); return params; end |