aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/mod_pubsub/node_default.erl4
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ec6af245..d0c53ad70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@
* src/mod_pubsub/mod_pubsub.erl: reply to suscriptions options queries
with unsupported feature error (EJAB-713)
+ * src/mod_pubsub/node_default.erl: remove pubsub_state record when
+ unsubscribing node without affiliation (EJAB-776)
+
2008-12-08 Mickael Remond <mremond@process-one.net>
* src/ejabberd_c2s.erl: Enforce client stanza from attribute
diff --git a/src/mod_pubsub/node_default.erl b/src/mod_pubsub/node_default.erl
index 97e363f79..9bf26b992 100644
--- a/src/mod_pubsub/node_default.erl
+++ b/src/mod_pubsub/node_default.erl
@@ -381,6 +381,10 @@ unsubscribe_node(Host, Node, Sender, Subscriber, _SubId) ->
%% Requesting entity is prohibited from unsubscribing entity
not Authorized ->
{error, ?ERR_FORBIDDEN};
+ %% Was just subscriber, remove the record
+ State#pubsub_state.affiliation == none ->
+ mnesia:delete({pubsub_state, State#pubsub_state.stateid}),
+ {result, default};
true ->
set_state(State#pubsub_state{subscription = none}),
{result, default}