diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2009-11-05 17:36:15 +0000 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2009-11-05 17:36:15 +0000 |
| commit | 09e847b97dc203169e30675865c36a982fd17fda (patch) | |
| tree | b9fb0cf5829695a1f28c60d7921ce5d69c74a3f0 /src/mod_pubsub | |
| parent | Fix ProcessOne name in comments. (diff) | |
fix root node deletion match
SVN Revision: 2729
Diffstat (limited to 'src/mod_pubsub')
| -rw-r--r-- | src/mod_pubsub/mod_pubsub.erl | 2 | ||||
| -rw-r--r-- | src/mod_pubsub/mod_pubsub_odbc.erl | 2 | ||||
| -rw-r--r-- | src/mod_pubsub/pubsub_odbc.patch | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl index 0389adf28..57c350c2e 100644 --- a/src/mod_pubsub/mod_pubsub.erl +++ b/src/mod_pubsub/mod_pubsub.erl @@ -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) -> diff --git a/src/mod_pubsub/mod_pubsub_odbc.erl b/src/mod_pubsub/mod_pubsub_odbc.erl index e6a54d22c..67365169f 100644 --- a/src/mod_pubsub/mod_pubsub_odbc.erl +++ b/src/mod_pubsub/mod_pubsub_odbc.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) -> diff --git a/src/mod_pubsub/pubsub_odbc.patch b/src/mod_pubsub/pubsub_odbc.patch index 6d103972c..1573e50a0 100644 --- a/src/mod_pubsub/pubsub_odbc.patch +++ b/src/mod_pubsub/pubsub_odbc.patch @@ -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. |