No need to explicitly skip old useless tables, simply fix keep_tables

diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl
index 9ceaa183686b3c094a2d31533e2599a6be32741c..a11b4bf4a4288da208ebac18f5ebbd87164c2614 100644 (file)
--- a/src/ejabberd_admin.erl
+++ b/src/ejabberd_admin.erl
@@ -427,18 +427,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