diff options
| author | Badlop <badlop@process-one.net> | 2011-09-14 12:15:53 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2011-09-14 16:19:23 +0200 |
| commit | a435c4b1235846c21e815809c911fc2bd792f365 (patch) | |
| tree | 180cfb6e94f3ec56f82b67368552e9f87313e5cf /src | |
| parent | Avoid crash when performing admin action (thanks to Evgeniy Khramtsov) (diff) | |
No need to explicitly skip old useless tables, simply fix keep_tables
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_admin.erl | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl index 5d21b124b..2b2bfe44f 100644 --- a/src/ejabberd_admin.erl +++ b/src/ejabberd_admin.erl @@ -446,18 +446,14 @@ restore_mnesia(Path) -> %% mod_configure/adhoc restore(Path) -> mnesia:restore(Path, [{keep_tables,keep_tables()}, - {skip_tables, skip_tables()}, {default_op, skip_tables}]). -skip_tables() -> - [disco_publish,user_caps,user_caps_resources]. - %% This function return a list of tables that should be kept from a previous %% version backup. %% Obsolete tables or tables created by module who are no longer used are not %% restored and are ignored. keep_tables() -> - lists:flatten([acl, passwd, config, local_config, disco_publish, + lists:flatten([acl, passwd, config, local_config, keep_modules_tables()]). %% Returns the list of modules tables in use, according to the list of actually |