@@ -1805,7 +1805,7 @@ create_node(Host, ServerHost, Node, Owner, GivenType, Access, Configuration) -> %%<li>The node is the root collection node, which cannot be deleted.</li> %%<li>The specified node does not exist.</li> %%</ul> -delete_node(_Host, [], _Owner) -> +delete_node(_Host, <<>>, _Owner) -> %% Node is the root {error, ?ERR_NOT_ALLOWED}; delete_node(Host, Node, Owner) -> src/mod_pubsub/mod_pubsub.erl @@ -1615,7 +1615,7 @@ create_node(Host, ServerHost, Node, Owner, GivenType, Access, Configuration) -> %%<li>The node is the root collection node, which cannot be deleted.</li> %%<li>The specified node does not exist.</li> %%</ul> -delete_node(_Host, [], _Owner) -> +delete_node(_Host, <<>>, _Owner) -> %% Node is the root {error, ?ERR_NOT_ALLOWED}; delete_node(Host, Node, Owner) -> src/mod_pubsub/mod_pubsub_odbc.erl @@ -1,5 +1,5 @@ ---- mod_pubsub.erl 2009-11-04 20:40:18.000000000 +0100 -+++ mod_pubsub_odbc.erl 2009-11-04 20:40:18.000000000 +0100 +--- mod_pubsub.erl 2009-11-05 18:36:05.000000000 +0100 ++++ mod_pubsub_odbc.erl 2009-11-05 18:36:16.000000000 +0100 @@ -42,7 +42,7 @@ %%% 6.2.3.1, 6.2.3.5, and 6.3. For information on subscription leases see %%% XEP-0060 section 12.18. src/mod_pubsub/pubsub_odbc.patch 263ab74d970470c74606e155291d9a53722189ce cromain cromain@1613c18e-e6f4-0310-972c-c3fad1d2be73 http://github.com/bjc/ejabberd/commit/0c4c952b27baeeb83756fcd598dd7d1c6c10d71c 0c4c952b27baeeb83756fcd598dd7d1c6c10d71c 2009-11-05T09:36:15-08:00 2009-11-05T09:36:15-08:00 fix root node deletion match git-svn-id: https://svn.process-one.net/ejabberd/branches/ejabberd-2.1.x@2729 1613c18e-e6f4-0310-972c-c3fad1d2be73 b9fb0cf5829695a1f28c60d7921ce5d69c74a3f0 cromain cromain@1613c18e-e6f4-0310-972c-c3fad1d2be73