25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00

fix root node deletion match

SVN Revision: 2730
This commit is contained in:
Christophe Romain 2009-11-05 17:36:54 +00:00
parent 26cd3a78d2
commit 1c4cc57e3f
3 changed files with 4 additions and 4 deletions

View File

@ -1847,7 +1847,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 node is the root collection node, which cannot be deleted.</li>
%%<li>The specified node does not exist.</li> %%<li>The specified node does not exist.</li>
%%</ul> %%</ul>
delete_node(_Host, [], _Owner) -> delete_node(_Host, <<>>, _Owner) ->
%% Node is the root %% Node is the root
{error, 'not-allowed'}; {error, 'not-allowed'};
delete_node(Host, Node, Owner) -> delete_node(Host, Node, Owner) ->

View File

@ -1658,7 +1658,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 node is the root collection node, which cannot be deleted.</li>
%%<li>The specified node does not exist.</li> %%<li>The specified node does not exist.</li>
%%</ul> %%</ul>
delete_node(_Host, [], _Owner) -> delete_node(_Host, <<>>, _Owner) ->
%% Node is the root %% Node is the root
{error, 'not-allowed'}; {error, 'not-allowed'};
delete_node(Host, Node, Owner) -> delete_node(Host, Node, Owner) ->

View File

@ -1,5 +1,5 @@
--- mod_pubsub.erl 2009-11-04 20:44:13.000000000 +0100 --- mod_pubsub.erl 2009-11-05 18:37:16.000000000 +0100
+++ mod_pubsub_odbc.erl 2009-11-04 20:44:13.000000000 +0100 +++ mod_pubsub_odbc.erl 2009-11-05 18:37:21.000000000 +0100
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
%%% 6.2.3.1, 6.2.3.5, and 6.3. For information on subscription leases see %%% 6.2.3.1, 6.2.3.5, and 6.3. For information on subscription leases see
%%% XEP-0060 section 12.18. %%% XEP-0060 section 12.18.